Commit Graph

175 Commits

Author SHA1 Message Date
Michael Niedermayer
78accb876c Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ffmpeg: fix some indentation
  ffmpeg: fix operation with --disable-avfilter
  simple_idct: remove disabled code
  motion_est: remove disabled code
  vc1: remove disabled code
  fate: separate lavf-mxf_d10 test from lavf-mxf
  cabac: Move code only used in the cabac test program to cabac.c.
  ffplay: warn that -pix_fmt is no longer working, suggest alternative
  ffplay: warn that -s is no longer working, suggest alternative
  lavf: rename enc variable in utils.c:has_codec_parameters()
  lavf: use designated initialisers for all (de)muxers.
  wav: remove a use of deprecated AV_METADATA_ macro
  rmdec: remove useless ap parameter from rm_read_header_old()
  dct-test: remove write-only variable
  des: fix #if conditional around P_shuffle
  Use LOCAL_ALIGNED in ff_check_alignment()

Conflicts:
	ffmpeg.c
	libavformat/avidec.c
	libavformat/matroskaenc.c
	libavformat/mp3enc.c
	libavformat/oggenc.c
	libavformat/utils.c
	tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-17 20:12:02 +02:00
Diego Biurrun
473e547e80 motion_est: remove disabled code 2011-07-17 17:32:37 +02:00
Michael Niedermayer
e10979ff56 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  changelog: misc typo and wording fixes
  H.264: add filter_mb_fast support for >8-bit decoding
  doc: Remove outdated comments about gcc 2.95 and gcc 3.3 support.
  lls: use av_lfg instead of rand() in test program
  build: remove unnecessary dependency on libs from 'all' target
  H.264: avoid redundant alpha/beta calculations in loopfilter
  H.264: optimize intra/inter loopfilter decision
  mpegts: fix Continuity Counter error detection
  build: remove unnecessary FFLDFLAGS variable
  vp8/mt: flush worker thread, not application thread context, on seek.
  mt: proper locking around release_buffer calls.
  DxVA2: unbreak build after [657ccb5ac7]
  hwaccel: unbreak build
  Eliminate FF_COMMON_FRAME macro.

Conflicts:
	Changelog
	Makefile
	doc/developer.texi
	libavcodec/avcodec.h
	libavcodec/h264.c
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-12 01:42:32 +02:00
Diego Biurrun
657ccb5ac7 Eliminate FF_COMMON_FRAME macro.
FF_COMMON_FRAME holds the contents of the AVFrame structure and is also copied
to struct Picture.  Replace by an embedded AVFrame structure in struct Picture.
2011-07-11 00:19:00 +02:00
Michael Niedermayer
686959e87e Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doxygen: Consistently use '@' instead of '\' for Doxygen markup.
  Use av_printf_format to check the usage of printf style functions
  Add av_printf_format, for marking printf style format strings and their parameters
  ARM: enable thumb for Cortex-M* CPUs
  nsvdec: Propagate error values instead of returning 0 in nsv_read_header().
  build: remove SRC_PATH_BARE variable
  build: move basic rules and variables to main Makefile
  build: move special targets to end of main Makefile
  lavdev: improve feedback in case of invalid frame rate/size
  vfwcap: prefer "framerate_q" over "fps" in vfw_read_header()
  v4l2: prefer "framerate_q" over "fps" in v4l2_set_parameters()
  fbdev: prefer "framerate_q" over "fps" in device context
  bktr: prefer "framerate" over "fps" for grab_read_header()
  ALSA: implement channel layout for playback.
  alsa: support unsigned variants of already supported signed formats.
  alsa: add support for more formats.
  ARM: allow building in Thumb2 mode

Conflicts:
	common.mak
	doc/APIchanges
	libavcodec/vdpau.h
	libavdevice/alsa-audio-common.c
	libavdevice/fbdev.c
	libavdevice/libdc1394.c
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-24 03:07:04 +02:00
Diego Biurrun
adbfc605f6 doxygen: Consistently use '@' instead of '\' for Doxygen markup.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-06-24 00:37:49 +02:00
Diego Biurrun
ac4a854811 Remove some non-compiling debug messages. 2011-06-08 00:45:47 +02:00
Maksym Veremeyenko
002e1f1eb3 motion_est: fix ffmpeg compilation with DEBUG defined
Remove the problematic av_dlog() call
2011-05-10 20:38:07 +02:00
Stefano Sabatini
ce5e49b0c2 replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
Stefano Sabatini
975a1447f7 Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2011-05-02 12:18:44 +02:00
Michael Niedermayer
be315a3232 Merge remote branch 'qatar/master'
* qatar/master:
Duplicate  AMV: disable DR1 and don't override EMU_EDGE
Duplicate  lavf: inspect more frames for fps when container time base is coarse
Wrong and we have correct fix: Fix races in default av_log handler
  vorbis: Replace sized int_fast integer types with plain int/unsigned.
  Remove disabled non-optimized code variants.
NO  bswap.h: Remove disabled code.
  Remove some disabled printf debug cruft.
  Replace more disabled printf() calls by av_dlog().
NO  tests: Remove disabled code.
NO  Replace some commented-out debug printf() / av_log() messages with av_dlog().
  vorbisdec: Replace some sizeof(type) by sizeof(*variable).
NO  vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.

Conflicts:
	libavcodec/h264.c
	libavcodec/vorbisdec.c
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-30 01:58:26 +02:00
Diego Biurrun
09cbf60f8e Replace more disabled printf() calls by av_dlog(). 2011-04-29 20:00:41 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Reimar Döffinger
b0c73ba11f motion_est: fix implicit truncation warnings
Patch by Reimar Döffinger and Eli Friedman (independently).

Originally committed as revision 24083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 12:27:44 +00:00
Diego Biurrun
ba87f0801d Remove explicit filename from Doxygen @file commands.
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.

Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Michael Niedermayer
fd8277ffa0 Optimize bidir_refine a bit.
compiled code is less tham 1/4 the size.
a tiny bit faster

Originally committed as revision 22777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 14:04:15 +00:00
Michael Niedermayer
a69220cce0 Change bidir refine hash code so we only need to perform a single
hash calculation for the whole function.
negligibly faster (about 0.1%)

Originally committed as revision 22775 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 12:34:08 +00:00
Michael Niedermayer
2d603902f3 Reduce the size of the bidir refine hashtable from 4096 to 256 and
change the hash function to something more sane and simple.
about 1/3 faster, no meassureable change in psnr or size and i gues
its even same md5 with my test file but i forgot testing that.

Originally committed as revision 22773 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 11:06:29 +00:00
Michael Niedermayer
e056d2a24b Move comment that belonged to cmp() back to cmp().
Originally committed as revision 22772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 01:13:59 +00:00
Michael Niedermayer
919e749772 slice dice, inline and outline cmp()
motion_est.o is now less than half its previous size.
No speedchange meassureable.

Originally committed as revision 22771 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-02 01:07:03 +00:00
Michael Niedermayer
fc4a2d1e8c Change ref_index structure so it matches how its organized in h264.
Also revert the related error concealment hotfix.

Originally committed as revision 22640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-23 02:17:04 +00:00
Måns Rullgård
94ca624fbc Move ff_sqrt() to libavutil/intmath.h
Originally committed as revision 22345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 21:19:56 +00:00
Diego Biurrun
bad5537e2c Use full internal pathname in doxygen @file directives.
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.

Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Aurelien Jacobs
199436b952 moves mid_pred() into mathops.h (with arch specific code split by directory)
Originally committed as revision 16681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-18 22:57:40 +00:00
Michael Niedermayer
a6f2c0d6e5 Fix regression test failure with pthreads on multiprocessor systems.
Fixes issue517

Originally committed as revision 15976 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-02 10:43:08 +00:00
Michael Niedermayer
6f55b11ec6 1000l Fix snow regression test that i broke in r15135.
Originally committed as revision 15136 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 00:22:00 +00:00
Michael Niedermayer
b74ec69366 Warn the user about me_method values that are not supported.
Fixes issue503

Originally committed as revision 15135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 23:55:47 +00:00
Michael Niedermayer
fdbb1feb27 Remove ancient code that hasnt worked in many years.
Originally committed as revision 14144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-09 19:21:08 +00:00
Michael Niedermayer
c192426fd8 Fix return type of ff_init_me().
Originally committed as revision 13487 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-28 01:54:09 +00:00
Michael Niedermayer
540c5220ff Check dia size a little more. Fixes CID80.
Originally committed as revision 13481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 23:41:10 +00:00
Aurelien Jacobs
9701840bb5 add FF_ prefix to all (frame)_TYPE usage
Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 23:31:02 +00:00
Diego Biurrun
7b94177e37 Group all copyright and author notices together.
Originally committed as revision 9483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 10:37:29 +00:00
Diego Biurrun
90b5b51eab misc typo fixes
Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 18:50:50 +00:00
Diego Biurrun
755bfeabcc misc spelling fixes
Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 09:29:25 +00:00
Loren Merritt
1cfe393a25 doxy comment tweaks
Originally committed as revision 8580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-31 23:58:33 +00:00
Guillaume Poirier
bb21f1762a Add doxy comments, based on Loren's explanations posted here:
Date: Mar 30, 2007 9:00 PM
Subject: Re: [Ffmpeg-devel] Motion Estimation in snow.c for Waevelet encoded frames (DWT)

Originally committed as revision 8579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-31 22:39:43 +00:00
Reimar Döffinger
f66e4f5f9e Add av_ prefix to clip functions
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-25 10:27:12 +00:00
Michael Niedermayer
d951bb9a5c test DIRECT{0,0} too if flag mv0 is used
slight PSNR/bitrate increase

Originally committed as revision 7361 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-22 23:30:57 +00:00
Michael Niedermayer
2175b80bed simplify
Originally committed as revision 7345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-21 15:22:16 +00:00
Michael Niedermayer
3b9cf3bdb3 i think this if() is useless lets abuse our users to test this ;)
Originally committed as revision 7344 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-21 15:21:44 +00:00
Michael Niedermayer
2f16af0667 skip motion estimation and encoding of non direct-0,0 MBs if the next MB is skiped (mpeg4 doesnt allow such MBs and in the past we did ME and encoding until at the end we droped them, so this should be faster though i didnt benchmark it, benchmark welcome)
Originally committed as revision 7343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-21 15:20:02 +00:00
Michael Niedermayer
95cefcb4ed 10l
Originally committed as revision 7328 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-17 15:41:30 +00:00
Michael Niedermayer
af6a403a05 warn user if the selected diamond size is larger then the motion estimation score cache size
Originally committed as revision 7326 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-17 13:11:34 +00:00
Michael Niedermayer
a6daaf7cce limit x/ymin/max to me_range
slight psnr/bitrate gain for most but not all files if me_range is used

Originally committed as revision 7325 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-17 12:07:09 +00:00
Guillaume Poirier
e828d257e7 Doxygen comments about variables described by Michael here:
Date: Tue, 12 Dec 2006 14:00:54 +0100
Subject: Re: [Ffmpeg-cvslog] r6876 - trunk/libavcodec/motion_est.c

Originally committed as revision 7288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-12 13:41:17 +00:00
Måns Rullgård
849f10351d rename always_inline to av_always_inline and move to common.h
Originally committed as revision 7256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-08 00:35:08 +00:00
Diego Biurrun
c6c367254f spelling cosmetics: cliped --> clipped
Originally committed as revision 7208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-02 14:19:49 +00:00
Michael Niedermayer
dd7e46e7c3 new I/P frame selection heuristic
PSNR/bitrate is slightly better for my (short) test videos
more tests welcome ...

Originally committed as revision 6876 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-02 23:36:39 +00:00
Michael Niedermayer
95da34cd54 CANDIDATE_MB_TYPE_INTER heuristic doesnt work at really low quality where the distortion becomes less relevant then the overhead of intra blocks
Originally committed as revision 6829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-28 20:00:05 +00:00