summaryrefslogtreecommitdiffstats
path: root/libavcodec/error_resilience.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-211-0/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED document libswscale bump error_resilience: skip last-MV predictor step if MVs are not available. error_resilience: actually add counter when adding a MV predictor. ... Conflicts: Changelog libavcodec/error_resilience.c libavfilter/defaults.c libavfilter/vf_drawtext.c libswscale/swscale.h tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * error_resilience: skip last-MV predictor step if MVs are not available.Ronald Bultje2011-06-201-0/+4
| | | | | | | | Fixes crashes when playing broken MPEG2-TS streams.
| * error_resilience: actually add counter when adding a MV predictor.Ronald Bultje2011-06-201-0/+1
| | | | | | | | Without, the predictor isn't actually used.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-031-7/+38
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) Replace custom DEBUG preprocessor trickery by the standard one. vorbis: Remove non-compiling debug statement. vorbis: Remove pointless DEBUG #ifdef around debug output macros. cook: Remove non-compiling debug output. Remove pointless #ifdefs around function declarations in a header. Replace #ifdef + av_log() combinations by av_dlog(). Replace custom debug output functions by av_dlog(). cook: Remove unused debug functions. Remove stray extra arguments from av_dlog() invocations. targa: fix big-endian build v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. vfwcap: add a framerate private option. v4l2: add a framerate private option. libdc1394: add a framerate private option. fbdev: add a framerate private option. bktr: add a framerate private option. oma: check avio_read() return value nutdec: remove unused variable Remove unused variables swscale: allocate larger buffer to handle altivec overreads. ... Conflicts: ffmpeg.c libavcodec/dca.c libavcodec/dirac.c libavcodec/error_resilience.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pthread.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/shorten.c libavcodec/truemotion2.c libavcodec/utils.c libavdevice/dv1394.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/4xm.c libavformat/apetag.c libavformat/asfdec.c libavformat/avidec.c libavformat/mmf.c libavformat/mpeg.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/oggdec.c libavformat/oggparseogm.c libavformat/rl2.c libavformat/rmdec.c libavformat/rpl.c libavformat/rtpdec_latm.c libavformat/sauce.c libavformat/sol.c libswscale/utils.c tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * H264/MPEG frame-level multi-threading.Alexander Strange2011-06-021-7/+38
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-021-4/+4
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | error concealment: check last pictures motion_val before using it.Michael Niedermayer2011-05-121-1/+1
| | | | | | | | | | Fixes NULL pointer dereference. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | error_concealment: Use previous pictures motion vectors when the current ↵Michael Niedermayer2011-05-111-0/+8
| | | | | | | | | | | | | | | | ones have been lost. Looks better for some cases, worse for others, overall not much difference. Its more correct though. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merging branch 'ffmpeg-mt/master'Multiple Authors2011-05-111-0/+2
| | | | | | | | | | | | | | Just some cosmetics & comments, the only functional change "error_resilience: use s->last_picture for accessing last MVs." Is so buggy that it needs a full rewrite, guess -1.0 PSNR loss wasnt enough for ronald to realize there was a problem.
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-021-4/+4
| |
* | Revert "Eliminate pointless '#if 1' statements without matching '#else'."Michael Niedermayer2011-04-271-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | no comment This reverts commit e6ff064845d02c43526c8a56dab121c219f16659. Conflicts: libavcodec/dsputil.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-271-12/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Eliminate pointless '#if 1' statements without matching '#else'.Diego Biurrun2011-04-261-12/+5
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* 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
* Add rectangle.h #include for fill_rectangle().Diego Biurrun2010-04-131-0/+1
| | | | Originally committed as revision 22877 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make sure the EC code does not attempt to use inter based concealment if thereMichael Niedermayer2010-03-301-0/+6
| | | | | | | is no reference frame available. (this can happen because the EC code will attempt to use reference frames even for I/IDR frames) Originally committed as revision 22732 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change ref_index structure so it matches how its organized in h264.Michael Niedermayer2010-03-231-3/+2
| | | | | | Also revert the related error concealment hotfix. Originally committed as revision 22640 to svn://svn.ffmpeg.org/ffmpeg/trunk
* fix compilation with --disable-everything --enable-decoder=mpeg2videoAurelien Jacobs2010-03-201-1/+1
| | | | Originally committed as revision 22612 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Hotfix for regtest-error failureMichael Niedermayer2010-03-201-2/+3
| | | | | | | a proper fix appears to require changing h263/mpeg2/motion est to index ref_index like h264. Ill do this change and then revert this hotfix but it will take a bit time. Originally committed as revision 22608 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Error concealment of h264 with multiple references.Michael Niedermayer2010-03-201-18/+35
| | | | Originally committed as revision 22603 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use H264s MC instead of mpeg4-asp qpel for h264 error resilience.Michael Niedermayer2010-03-171-0/+11
| | | | Originally committed as revision 22572 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make sure all mvs of a mb are set in the error concealment code.Michael Niedermayer2010-03-141-3/+8
| | | | Originally committed as revision 22520 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Ensure that the deblock filter accesses the correct MVs for h264.Michael Niedermayer2010-03-141-6/+12
| | | | Originally committed as revision 22517 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix guess_mv() so that it works correctly with 4x4 MV blocks.Michael Niedermayer2010-03-121-11/+35
| | | | Originally committed as revision 22485 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of mb2b8_xy and b8_stride, change arrays organized based on b8_stride toMichael Niedermayer2010-02-251-1/+1
| | | | | | | ones based on mb_stride in h264. about 20 cpu cycles faster overall per MB Originally committed as revision 22065 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 4:2:2 4:4:4 bugfix for the error concealment code.Michael Niedermayer2009-12-011-2/+2
| | | | Originally committed as revision 20678 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Disable error resilience for field pictures, this was never supported,Michael Niedermayer2009-11-301-0/+1
| | | | | | results where more or less random but should not have crashed. Originally committed as revision 20671 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make sure error resilience does not try to use unavailable reference frames.Reimar Döffinger2009-04-101-6/+17
| | | | | | Fixes the crash described in issue 706. Originally committed as revision 18407 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Return early if a HW accelerator is used.Gwenole Beauchesne2009-02-271-0/+3
| | | | | | Patch by Gwenole Beauchesne. Originally committed as revision 17635 to svn://svn.ffmpeg.org/ffmpeg/trunk
* More approved hunks for VAAPI & our new and cleaner hwaccel API.Gwenole Beauchesne2009-02-231-0/+1
| | | | | | patch by Gwenole Beauchesne gbeauchesne splitted-desktop com Originally committed as revision 17540 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Get rid of some '#if CONFIG_MPEG_XVMC_DECODER' preprocessor checks around ifDiego Biurrun2009-02-161-8/+4
| | | | | | statements by merging the CONFIG_MPEG_XVMC_DECODER check into the if condition. Originally committed as revision 17369 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove redundant CONFIG_XVMC option, CONFIG_MPEG_XVMC_DECODER suffices.Diego Biurrun2009-02-141-3/+3
| | | | Originally committed as revision 17229 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
* Change semantic of CONFIG_*, HAVE_* and ARCH_*.Aurelien Jacobs2009-01-131-3/+3
| | | | | | They are now always defined to either 0 or 1. Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move VDPAU check, make future VDPAU patches smaller.Carl Eugen Hoyos2009-01-091-0/+1
| | | | Originally committed as revision 16508 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Switch xvmc over to a CONFIG_ option.Diego Biurrun2008-12-151-3/+3
| | | | Originally committed as revision 16153 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not attempt to perform error concealment in lowres mode as this isMichael Niedermayer2008-09-301-1/+1
| | | | | | not supported currently. Originally committed as revision 15465 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Ensure that no non-existing frame is used.Michael Niedermayer2008-09-251-1/+1
| | | | | | Fixes issue624. Originally committed as revision 15416 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename error_resilience to error_recognition.Michael Niedermayer2008-09-081-4/+4
| | | | Originally committed as revision 15270 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: typo fixesDiego Biurrun2008-03-221-1/+1
| | | | Originally committed as revision 12554 to svn://svn.ffmpeg.org/ffmpeg/trunk
* typo: occured --> occurredDiego Biurrun2008-03-221-1/+1
| | | | Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add FF_ prefix to all (frame)_TYPE usageAurelien Jacobs2008-03-091-4/+4
| | | | Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
* typo fix: inited --> initializedDiego Biurrun2008-02-131-1/+1
| | | | Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk
* On bitstream error is_intra_more_likely() could use dsp.sad[0]() that will ↵Ivan Kalvachev2007-09-281-0/+5
| | | | | | segfault when xvmc is in use. Originally committed as revision 10610 to svn://svn.ffmpeg.org/ffmpeg/trunk
* misc spelling fixesDiego Biurrun2007-06-121-1/+1
| | | | Originally committed as revision 9289 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove redundant #inclusion of common.h, avcodec.h already #includes it.Diego Biurrun2007-05-101-1/+0
| | | | Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add av_ prefix to clip functionsReimar Döffinger2007-02-251-2/+2
| | | | Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
* sanity checkMichael Niedermayer2007-02-091-0/+5
| | | | Originally committed as revision 7890 to svn://svn.ffmpeg.org/ffmpeg/trunk
* rename cropTbl -> ff_cropTblMåns Rullgård2006-11-121-2/+2
| | | | Originally committed as revision 6992 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud