summaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
...
* | exr: reset compression in decode_frame()Paul B Mahol2013-02-211-2/+1
| | | | | | | | | | | | | | This fixes decoding of images if compression changes. Regression since b040ffc84c5e. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-212-1/+5
|\ \ | |/ | | | | | | | | | | | | | | * qatar/master: dxva2: Add missing #define to make header compile standalone arm: vp8: Add missing #includes for header to compile standalone doc: filters: Correct BNF FILTER description Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dxva2: Add missing #define to make header compile standaloneDiego Biurrun2013-02-201-1/+1
| |
| * arm: vp8: Add missing #includes for header to compile standaloneDiego Biurrun2013-02-201-0/+4
| |
* | brender_pix: use a grayscale palette as fallback instead of a uninitialized one.Michael Niedermayer2013-02-211-0/+8
| | | | | | | | | | | | Improves: 3-0-CORPSE.PIX Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mjpegdec: check for packed rgb mjpeg.Michael Niedermayer2013-02-211-4/+9
| | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix bits_per_coded_sample when encoding png with frame-level multithreading.Carl Eugen Hoyos2013-02-201-5/+17
| | | | | | | | Fixes ticket #2290.
* | h264: Fix handling of changing reference counts between slicesMichael Niedermayer2013-02-202-1/+6
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: call alloc_scratch_buffers() only once linesize is knownMichael Niedermayer2013-02-201-17/+9
| | | | | | | | | | | | | | Fixes out of array accesses Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8a11ce43d08352f7a290355ebb5b29c495ad9609'Michael Niedermayer2013-02-201-6/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '8a11ce43d08352f7a290355ebb5b29c495ad9609': build: Ensure that output directories for header objects are created h264: Get rid of unnecessary casts Conflicts: common.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Get rid of unnecessary castsMartin Storsjö2013-02-201-6/+6
| | | | | | | | | | | | | | This gets rid of a number of warnings about casts discarding qualifiers from the pointer target, present since 7ebfb466a. Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264/svq3: Stop using draw_edgesRonald S. Bultje2013-02-193-44/+14
| | | | | | | | | | | | | | | | | | | | | | Instead, only extend edges on-demand when the motion vector actually crosses the visible decoded area using ff_emulated_edge_mc(). This changes decoding time for cathedral from 8.722sec to 8.706sec, i.e. 0.2% faster overall. More generally (VP8 uses this also), low-motion content gets significant speed improvements, whereas high-motion content tends to decode in approximately the same time. Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264: Don't store intra pcm samples in h->mbRonald S. Bultje2013-02-194-23/+21
| | | | | | | | | | | | | | | | | | Instead, keep them in the bitstream buffer until we read them verbatim, this saves a memcpy() and a subsequent clearing of the target buffer. decode_cabac+decode_mb for a sample file (CAPM3_Sony_D.jsv) goes from 6121.4 to 6095.5 cycles, i.e. 26 cycles faster. Signed-off-by: Martin Storsjö <martin@martin.st>
| * get_bits: Return pointer to buffer that is the result of the alignmentRonald S. Bultje2013-02-191-1/+2
| | | | | | | | | | | | | | This allows more transparent mixing of get_bits and whole-byte access without having to touch get_bits internals. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0'Michael Niedermayer2013-02-202-3/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2ed008204d5467be03a0a3af1e293b2f7038d0a0': h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputil Conflicts: libavcodec/dsputil.c libavcodec/h264.c libavcodec/h264_mb_template.c libavcodec/h264addpx_template.c libavcodec/h264dsp.c libavcodec/h264dsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: Add add_pixels4/8() to h264dsp, and remove add_pixels4 from dsputilRonald S. Bultje2013-02-198-53/+120
| | | | | | | | | | | | | | | | | | These functions are mostly H264-specific (the only other user I can spot is bink), and this allows us to special-case some functionality for H264. Also remove the 16-bit-coeff with >8bpp versions (unused) and merge the duplicate 32-bit-coeff for >8bpp (identical). Signed-off-by: Martin Storsjö <martin@martin.st>
| * h264chroma: Remove duplicate 9/10 bit functionsRonald S. Bultje2013-02-192-17/+7
| | | | | | | | | | | | | | These functions do the same thing in 16 bit space and don't need any depth specific clipping. Signed-off-by: Martin Storsjö <martin@martin.st>
| * vp56: Remove clear_blocks call, and clear alpha plane U/V DC onlyRonald S. Bultje2013-02-191-2/+5
| | | | | | | | | | | | | | | | The non-alpha and alpha-Y planes are cleared in the idct_put/add() calls. For the alpha U/V planes, we only care about the DC for entropy context prediction purposes, the rest of the data is unused. Signed-off-by: Martin Storsjö <martin@martin.st>
* | cinepak: More correct Cinepak decoder.u-bo1b@0w.se2013-02-201-4/+7
| | | | | | | | | | | | | | | | change the treatment of the strip y coordinates which previously did not follow the description (nor did it behave like the binary decoder on files with absolute strip offsets). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cinepak: simplifyMichael Niedermayer2013-02-201-13/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cinepak: Use correct colorspace.u-bo1b@0w.se2013-02-201-109/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | The new code is also faster and more robust. As for the performance: old decoder + conversion to rgb: fps = 2618 old decoder, without converting to rgb: fps = 4012 new decoder, producing rgb: fps = 4502 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec_align_dimensions2: Ensure cinepak has large enough buffers.Michael Niedermayer2013-02-201-1/+8
| | | | | | | | | | | | | | This is partly redundant with the following patches, but its safer Found-by: u-bo1b@0w.se Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cook: check js_subband_start for validityMichael Niedermayer2013-02-201-0/+5
| | | | | | | | | | | | | | Fixes out of array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | shorten: Fix signedness of comparissionMichael Niedermayer2013-02-191-2/+2
| | | | | | | | | | | | | | Fixes out of array accessed Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: dont decode slices when the slice header failed to decode.Michael Niedermayer2013-02-191-2/+6
| | | | | | | | | | | | | | Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tiff: check bppcountMichael Niedermayer2013-02-191-0/+5
| | | | | | | | | | | | | | Fixes division by 0 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | bmp: check available space when reading paletteMichael Niedermayer2013-02-191-0/+4
| | | | | | | | | | | | | | Fixes out of array read Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: integrate clear_blocks calls with IDCT.Ronald S. Bultje2013-02-1913-77/+209
| | | | | | | | | | | | | | | | | | The non-intra-pcm branch in hl_decode_mb (simple, 8bpp) goes from 700 to 672 cycles, and the complete loop of decode_mb_cabac and hl_decode_mb (in the decode_slice loop) goes from 1759 to 1733 cycles on the clip tested (cathedral), i.e. almost 30 cycles per mb faster. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | svq3: fix decoding residual blocks of b-frames.Ronald S. Bultje2013-02-191-1/+1
| | | | | | | | | | | | | | | | The residual block data of 16x16 blocks was ignored for b-frames, which leads to easy-to-identify artifacts. After this patch, the artifacts are gone. Sample video: svq3_watermark.mov. (Fate results unaffected.) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/h263_loopfilter: Fix author attribution after code has been ↵Michael Niedermayer2013-02-191-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moved/splited around Reference: commit 3615e2be846f6382aa42360d02d16b25f443af9f Author: Michael Niedermayer <michaelni@gmx.at> Date: Tue Dec 2 22:02:57 2003 +0000 h263_h_loop_filter_mmx Originally committed as revision 2553 to svn://svn.ffmpeg.org/ffmpeg/trunk commit 359f98ded95ec65f7109b25f3cfaa9189c4fab9c Author: Michael Niedermayer <michaelni@gmx.at> Date: Tue Dec 2 20:28:10 2003 +0000 h263_v_loop_filter_mmx Originally committed as revision 2552 to svn://svn.ffmpeg.org/ffmpeg/trunk Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-193-164/+189
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: x86: dsputil: Fix h263 loop filter link error in some configurations Conflicts: libavcodec/x86/dsputil.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dsputil: Fix h263 loop filter link error in some configurationsDaniel Kang2013-02-183-162/+189
| | | | | | | | | | | | | | This was caused by unconditionally referencing a conditionally compiled table. Now the code is also compiled conditionally. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '7a03145ed7cb4f1ce794b5126559dd6f38029243'Michael Niedermayer2013-02-191-1/+1
|\ \ | |/ | | | | | | | | | | * commit '7a03145ed7cb4f1ce794b5126559dd6f38029243': x86: dsputil: int --> ptrdiff_t for ff_put_pixels16_mmxext line_size param Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: dsputil: int --> ptrdiff_t for ff_put_pixels16_mmxext line_size paramDaniel Kang2013-02-181-1/+1
| | | | | | | | | | | | | | This avoids SIMD-optimized functions having to sign-extend their line size argument manually to be able to do pointer arithmetic. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * svq3: unbreak decodingMatti Hamalainen2013-02-181-4/+6
| | | | | | | | a7d2861d36756b913e85681b86ed3385274e8ced removed necessary braces.
* | tmv: initialize unused pallete entries with 0Paul B Mahol2013-02-191-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | h264: put visualization and debug support backMichael Niedermayer2013-02-192-0/+8
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: make ff_print_debug_info independant of mpegvideoMichael Niedermayer2013-02-192-62/+74
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | split out ff_hwaccel_pixfmt_list_420[] over individual codecs.Ronald S. Bultje2013-02-187-24/+50
| | | | | | | | | | | | | | | | | | Not all hwaccels implement all codecs, so using one single list for multiple such codecs means some codecs will be represented in the list, even though they don't actually handle that codec. Copying specific lists in each codec fixes that. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cdgraphics: set palette to zero tooPaul B Mahol2013-02-181-1/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavc/cdxl: clear palette before reading itPaul B Mahol2013-02-181-0/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | x86/dsputil: fix compilation when h263 decoder/encoder are disabled.Ronald S. Bultje2013-02-181-1/+2
| | | | | | | | | | | | | | | | The symbol "ff_h263_loop_filter_strength" is defined in h263.c, but the h263 loopfilter functions (in the .asm file) are not optimized out (even though their function pointers are never assigned). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264/svq3: stop using draw_edges.Ronald S. Bultje2013-02-183-44/+15
| | | | | | | | | | | | | | | | | | | | | | Instead, only extend edges on-demand when the motion vector actually crosses the visible decoded area using ff_emulated_edge_mc(). This changes decoding time for cathedral from 8.722sec to 8.706sec, i.e. 0.2% faster overall. More generally (VP8 uses this also), low-motion content gets significant speed improvements, whereas high-motion content tends to decode in approximately the same time. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b'Michael Niedermayer2013-02-181-18/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b': build: make audio_frame_queue a stand-alone component Conflicts: configure libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: make audio_frame_queue a stand-alone componentLuca Barbato2013-02-171-14/+11
| | | | | | | | | | Encoders requiring it have the dependency expressed in the configure.
* | Merge commit '870a0c669e536d56c6325d84f65e34c53792398e'Michael Niedermayer2013-02-181-2/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '870a0c669e536d56c6325d84f65e34c53792398e': build: The libopencore-amrnb encoder depends on audio_frame_queue Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: The libopencore-amrnb encoder depends on audio_frame_queueDiego Biurrun2013-02-171-1/+1
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '8837f4396a1a458a0efb07fe7daba7b847755a7a'Michael Niedermayer2013-02-181-2/+2
|\ \ | |/ | | | | | | | | | | * commit '8837f4396a1a458a0efb07fe7daba7b847755a7a': libopencore-amrwb: Make AMR-WB ifdeffery more precise Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libopencore-amrwb: Make AMR-WB ifdeffery more preciseDiego Biurrun2013-02-171-2/+2
| | | | | | | | | | | | | | | | The library might provide an encoder in the future, so it's better to check for the presence of the decoder rather than just the library. CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'e6bda9a9fd86505927a2e095e495eae104860701'Michael Niedermayer2013-02-181-1/+5
|\ \ | |/ | | | | | | | | | | * commit 'e6bda9a9fd86505927a2e095e495eae104860701': libopencore-amr: Conditionally compile decoder and encoder bits Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud