summaryrefslogtreecommitdiffstats
path: root/libavcodec/motion_est.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-121-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) fix AC3ENC_OPT_MODE_ON/OFF h264: fix HRD parameters parsing prores: implement multithreading. prores: idct sse2/sse4 optimizations. swscale: use aligned move for storage into temporary buffer. prores: extract idct into its own dspcontext and merge with put_pixels. h264: fix invalid shifts in init_cavlc_level_tab() intfloat_readwrite: fix signed addition overflows mov: do not misreport empty stts mov: cosmetics, fix for and if spacing id3v2: fix NULL pointer dereference mov: read album_artist atom mov: fix disc/track numbers and totals doc: fix references to obsolete presets directories for avconv/ffmpeg flashsv: return more meaningful error value flashsv: fix typo in av_log() message smacker: validate channels and sample format. smacker: check buffer size before reading output size smacker: validate number of channels smacker: Separate audio flags from sample rates in smacker demuxer. ... Conflicts: cmdutils.h doc/ffmpeg.texi libavcodec/Makefile libavcodec/motion_est_template.c libavformat/id3v2.c libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * motion_est: make MotionExtContext.map_generation unsignedMans Rullgard2011-10-111-1/+1
| | | | | | | | | | | | | | | | The way this value is used, it should be an unsigned type. While the numerical value has no meaning, unsigned wraparound is relied upon. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-091-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: lavf: fix signed overflow in avformat_find_stream_info() vp8: fix signed overflows motion_est: fix some signed overflows dca: fix signed overflow in shift aacdec: fix undefined shifts bink: Check for various out of bound writes bink: Check for out of bound writes when building tree put_bits: fix invalid shift by 32 in flush_put_bits() Conflicts: libavcodec/bink.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * motion_est: fix some signed overflowsMans Rullgard2011-10-081-2/+2
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-171-52/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * motion_est: remove disabled codeDiego Biurrun2011-07-171-52/+0
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-121-74/+75
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 [657ccb5ac75ce34e62bd67f228d9bd36db72189e] 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>
| * Eliminate FF_COMMON_FRAME macro.Diego Biurrun2011-07-111-74/+75
| | | | | | | | | | 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.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-241-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * doxygen: Consistently use '@' instead of '\' for Doxygen markup.Diego Biurrun2011-06-241-1/+1
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Remove some non-compiling debug messages.Diego Biurrun2011-06-081-2/+0
| |
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-021-2/+2
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | motion_est: fix ffmpeg compilation with DEBUG definedMaksym Veremeyenko2011-05-101-2/+0
| | | | | | | | Remove the problematic av_dlog() call
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-021-2/+2
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-301-4/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Replace more disabled printf() calls by av_dlog().Diego Biurrun2011-04-291-4/+2
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* motion_est: fix implicit truncation warningsReimar Döffinger2010-07-071-12/+13
| | | | | | Patch by Reimar Döffinger and Eli Friedman (independently). Originally committed as revision 24083 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | 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
* Optimize bidir_refine a bit.Michael Niedermayer2010-04-021-26/+75
| | | | | | | 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
* Change bidir refine hash code so we only need to perform a singleMichael Niedermayer2010-04-021-5/+6
| | | | | | | hash calculation for the whole function. negligibly faster (about 0.1%) Originally committed as revision 22775 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reduce the size of the bidir refine hashtable from 4096 to 256 andMichael Niedermayer2010-04-021-2/+2
| | | | | | | | 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
* Move comment that belonged to cmp() back to cmp().Michael Niedermayer2010-04-021-3/+3
| | | | Originally committed as revision 22772 to svn://svn.ffmpeg.org/ffmpeg/trunk
* slice dice, inline and outline cmp()Michael Niedermayer2010-04-021-15/+77
| | | | | | | 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
* Change ref_index structure so it matches how its organized in h264.Michael Niedermayer2010-03-231-4/+4
| | | | | | Also revert the related error concealment hotfix. Originally committed as revision 22640 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move ff_sqrt() to libavutil/intmath.hMåns Rullgård2010-03-081-0/+1
| | | | Originally committed as revision 22345 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-011-1/+1
| | | | | | | 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
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-1/+1
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* moves mid_pred() into mathops.h (with arch specific code split by directory)Aurelien Jacobs2009-01-181-0/+1
| | | | Originally committed as revision 16681 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix regression test failure with pthreads on multiprocessor systems.Michael Niedermayer2008-12-021-2/+0
| | | | | | Fixes issue517 Originally committed as revision 15976 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 1000l Fix snow regression test that i broke in r15135.Michael Niedermayer2008-09-011-1/+2
| | | | Originally committed as revision 15136 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Warn the user about me_method values that are not supported.Michael Niedermayer2008-08-311-0/+4
| | | | | | Fixes issue503 Originally committed as revision 15135 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove ancient code that hasnt worked in many years.Michael Niedermayer2008-07-091-257/+0
| | | | Originally committed as revision 14144 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix return type of ff_init_me().Michael Niedermayer2008-05-281-1/+3
| | | | Originally committed as revision 13487 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check dia size a little more. Fixes CID80.Michael Niedermayer2008-05-271-0/+6
| | | | Originally committed as revision 13481 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add FF_ prefix to all (frame)_TYPE usageAurelien Jacobs2008-03-091-2/+2
| | | | Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Group all copyright and author notices together.Diego Biurrun2007-07-051-2/+1
| | | | Originally committed as revision 9483 to svn://svn.ffmpeg.org/ffmpeg/trunk
* misc typo fixesDiego Biurrun2007-06-121-1/+1
| | | | Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk
* misc spelling fixesDiego Biurrun2007-06-121-2/+4
| | | | Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
* doxy comment tweaksLoren Merritt2007-03-311-2/+2
| | | | Originally committed as revision 8580 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add doxy comments, based on Loren's explanations posted here:Guillaume Poirier2007-03-311-0/+3
| | | | | | | 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
* Add av_ prefix to clip functionsReimar Döffinger2007-02-251-6/+6
| | | | Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
* test DIRECT{0,0} too if flag mv0 is usedMichael Niedermayer2006-12-221-0/+2
| | | | | | slight PSNR/bitrate increase Originally committed as revision 7361 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplifyMichael Niedermayer2006-12-211-2/+2
| | | | Originally committed as revision 7345 to svn://svn.ffmpeg.org/ffmpeg/trunk
* i think this if() is useless lets abuse our users to test this ;)Michael Niedermayer2006-12-211-0/+1
| | | | Originally committed as revision 7344 to svn://svn.ffmpeg.org/ffmpeg/trunk
* skip motion estimation and encoding of non direct-0,0 MBs if the next MB is ↵Michael Niedermayer2006-12-211-0/+12
| | | | | | 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
* 10lMichael Niedermayer2006-12-171-1/+1
| | | | Originally committed as revision 7328 to svn://svn.ffmpeg.org/ffmpeg/trunk
* warn user if the selected diamond size is larger then the motion estimation ↵Michael Niedermayer2006-12-171-0/+6
| | | | | | score cache size Originally committed as revision 7326 to svn://svn.ffmpeg.org/ffmpeg/trunk
* limit x/ymin/max to me_rangeMichael Niedermayer2006-12-171-0/+7
| | | | | | 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
* Doxygen comments about variables described by Michael here:Guillaume Poirier2006-12-121-1/+3
| | | | | | | 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
OpenPOWER on IntegriCloud