summaryrefslogtreecommitdiff
path: root/libavcodec/mpeg12dec.c
Commit message (Collapse)AuthorAge
* Merge commit 'cc8163e1a3601a56f722a4720516e860bf1c6198'Michael Niedermayer2014-03-22
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc8163e1a3601a56f722a4720516e860bf1c6198': avcodec: more correct printf specifiers Conflicts: libavcodec/4xm.c libavcodec/alsdec.c libavcodec/dfa.c libavcodec/h264_ps.c libavcodec/jpeg2000dec.c libavcodec/lagarith.c libavcodec/mpeg12dec.c libavcodec/rv10.c libavcodec/svq3.c libavcodec/wmaprodec.c libavcodec/xwddec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: more correct printf specifiersDiego Biurrun2014-03-22
| |
* | Merge commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b'Michael Niedermayer2014-03-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e0c16e4e3259cf50b5bac4c23bb6e517f397c74b': mpegvideo: move mpegvideo formats-related defines to mpegutils.h Conflicts: libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_mvpred.h libavcodec/svq1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: move mpegvideo formats-related defines to mpegutils.hVittorio Giovara2014-03-16
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-14
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: mpeg12dec: do not add stereo3D side data to a non-existing frame Conflicts: libavcodec/mpeg12dec.c See: fe285b04bbad23ddfac164e22034b5ee76e039a6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12dec: do not add stereo3D side data to a non-existing frameJanne Grunau2014-02-13
| | | | | | | | | | | | | | | | | | User data is usually coded before slice data. That means the frame the user data belongs to is not available while parsing the user data. The stereo3D side data has to use the same indirection over the private context as pan scan information and A53 captions. Bug-Id:632
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-05
|\| | | | | | | | | | | | | | | | | | | * qatar/master: mpeg: K&R formatting cosmetics Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg: K&R formatting cosmeticsVittorio Giovara2014-02-04
| | | | | | | | | | | | | | Also adjust header #include order and some comments. Signed-off-by: Diego Biurrun <diego@biurrun.de> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/mpeg12dec: Revert Change to mpeg2_fast_decode_block_non_intraMichael Niedermayer2014-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the speed regression from 20626f53e9f41cb3db82329ed3db7d773cfa3a8f and still checks sufficiently to prevent out of allocated memory accesses due to the index Before: 1823 decicycles in mpeg2_fast_decode_block_non_intra, 8388493 runs, 115 skips After: 1808 decicycles in mpeg2_fast_decode_block_non_intra, 8388494 runs, 114 skips Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: Redesign index checks for mpeg2_fast_decode_block_intraMichael Niedermayer2014-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the speed regression from 20626f53e9f41cb3db82329ed3db7d773cfa3a8f and still checks sufficiently to prevent out of allocated memory accesses due to the index Before: 1681 decicycles in mpeg2_fast_decode_block_intra, 4194238 runs, 66 skips After: 1658 decicycles in mpeg2_fast_decode_block_intra, 4194248 runs, 56 skips Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6d93307f8df81808f0dcdbc064b848054a6e83b3'Michael Niedermayer2014-01-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6d93307f8df81808f0dcdbc064b848054a6e83b3': mpeg12: check scantable indices in all decode_block functions Benchmarks Before: 1878 decicycles in mpeg2_decode_block_non_intra, 8388487 runs, 121 skips 1700 decicycles in mpeg2_decode_block_intra, 4194239 runs, 65 skips 1808 decicycles in mpeg2_fast_decode_block_non_intra, 8388492 runs, 116 skips 1669 decicycles in mpeg2_fast_decode_block_intra, 4194248 runs, 56 skips -- 2056 decicycles in mpeg1_decode_block_inter, 65535 runs, 1 skips 2346 decicycles in mpeg1_decode_block_intra, 32768 runs, 0 skips 2011 decicycles in mpeg1_fast_decode_block_inter, 65533 runs, 3 skips ---------------- After: 1858 decicycles in mpeg2_decode_block_non_intra, 8388490 runs, 118 skips 1691 decicycles in mpeg2_decode_block_intra, 4194233 runs, 71 skips 1823 decicycles in mpeg2_fast_decode_block_non_intra, 8388493 runs, 115 skips 1681 decicycles in mpeg2_fast_decode_block_intra, 4194238 runs, 66 skips -- 2010 decicycles in mpeg1_decode_block_inter, 65535 runs, 1 skips 2322 decicycles in mpeg1_decode_block_intra, 32766 runs, 2 skips 1995 decicycles in mpeg1_fast_decode_block_inter, 65535 runs, 1 skips All benchmarks are the best scores of several runs Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12: check scantable indices in all decode_block functionsJanne Grunau2014-01-25
| | | | | | | | | | | | | | | | | | Add checks to the fast functions used with CODEC_FLAGS2_FAST and move the check for all other functions to before the invalid memory is accessed. Fixes https://trac.videolan.org/vlc/ticket/9713 with CODEC_FLAGS2_FAST. CC: libav-stable@libav.org
* | avcodec/mpeg12dec: fix mis-indented lineMichael Niedermayer2014-01-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: Disable the checked bitstream readerMichael Niedermayer2014-01-24
| | | | | | | | | | | | Mpeg1/2 should not need it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: Check for overread in mpeg_decode_slice()Michael Niedermayer2014-01-24
| | | | | | | | | | | | This is needed in case the checked bitstream reader is disabled Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: check block index in mpeg2_fast_decode_block_non_intra()Michael Niedermayer2014-01-24
| | | | | | | | | | | | Prevents some overreads at the cost of 1 cpu cycle Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: Optimize mpeg1_decode_block_intra()Michael Niedermayer2014-01-24
| | | | | | | | | | | | sandybridge i7 274->260 cycles Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: check for overread in mpeg1_fast_decode_block_inter()Michael Niedermayer2014-01-24
| | | | | | | | | | | | No speedloss meassured Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: Make mpeg2_fast_decode_block_intra() more robust by ↵Michael Niedermayer2014-01-24
| | | | | | | | | | | | breaking out on invalid vlcs Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix compilation with --disable-hwaccel=mpeg1_xvmc,mpeg2_xvmcCarl Eugen Hoyos2014-01-20
| |
* | Convert XvMC to hwaccel v3Ivan Kalvachev2013-12-22
| | | | | | | | | | Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: Don't create side data when current picture ptr is NULL.Tomer Barletz2013-12-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'bacc2869f37b17b2a89e1083289fdaf7f95f27bc'Michael Niedermayer2013-12-09
|\| | | | | | | | | | | | | * commit 'bacc2869f37b17b2a89e1083289fdaf7f95f27bc': mpeg12dec: parse frame packing arrangement user_data and save relevant stereo3d information Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12dec: parse frame packing arrangement user_data and save relevant ↵Vittorio Giovara2013-12-09
| | | | | | | | stereo3d information
* | Merge commit 'a097f0049b28dc3ed13625e4a42619292c92492f'Michael Niedermayer2013-12-06
|\| | | | | | | | | | | | | | | | | | | * commit 'a097f0049b28dc3ed13625e4a42619292c92492f': mpeg12dec: move first_slice from MpegEncContext to Mpeg1Context Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12dec: move first_slice from MpegEncContext to Mpeg1ContextAnton Khirnov2013-12-05
| |
* | Merge commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025'Michael Niedermayer2013-11-26
|\| | | | | | | | | | | | | | | | | | | | | * commit '1eaac1d6f7bb8e52d82e1a114c88a59a9a8e5025': mpeg12dec: Extract CC user data into frame side data Conflicts: doc/APIchanges libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12dec: Extract CC user data into frame side dataJohn Stebbins2013-11-26
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * mpeg12dec: Remove outdated UV swapping code for VCR2Diego Biurrun2013-11-14
| |
* | Merge commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2'Michael Niedermayer2013-11-14
|\| | | | | | | | | | | | | * commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2': mpeg12dec: Remove unused swap_uv member from Mpeg1Context Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12dec: Remove unused swap_uv member from Mpeg1ContextDiego Biurrun2013-11-14
| |
* | mpeg12dec: Remove incomplete and wrong UV swapping code for VCR2Diego Biurrun2013-11-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Deprecate obsolete XvMC hardware decoding support Conflicts: libavcodec/mpeg12.c libavcodec/mpeg12dec.c libavcodec/mpegvideo.c libavcodec/options_table.h libavutil/pixdesc.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Deprecate obsolete XvMC hardware decoding supportDiego Biurrun2013-11-13
| | | | | | | | | | | | | | XvMC has long ago been superseded by newer acceleration APIs, such as VDPAU, and few downstreams still support it. Furthermore XvMC is not implemented within the hwaccel framework, but requires its own specific code in the MPEG-1/2 decoder, which is a maintenance burden.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-10
|\| | | | | | | | | | | | | | | | | | | * qatar/master: hwaccel: Simplify ff_find_hwaccel Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: Simplify ff_find_hwaccelLuca Barbato2013-11-10
| | | | | | | | It is always called by passing fields from an AVCodecContext.
* | Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'Michael Niedermayer2013-11-01
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '13207484bba8a8b78b40d5a22da8c9c555429089': mpeg4video_parser: stop using deprecated avcodec_set_dimensions mpeg12dec: stop using deprecated avcodec_set_dimensions mjpegdec: stop using deprecated avcodec_set_dimensions libvpxdec: stop using deprecated avcodec_set_dimensions Conflicts: libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4video_parser.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12dec: stop using deprecated avcodec_set_dimensionsAnton Khirnov2013-10-31
| |
* | avcodec/mpeg12dec: Use skip_1stop_8data_bits()Michael Niedermayer2013-10-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpeg12dec: forward errors when EXPLODE is setMichael Niedermayer2013-10-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cosmetics: group remaining .name and .long_name.Clément Bœsch2013-10-04
| | | | | | | | See b2bed9325.
* | Merge commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2'Michael Niedermayer2013-10-04
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2bed9325dbd6be0da1d91ffed3f513c40274fd2': cosmetics: Group .name and .long_name together in codec/format declarations Conflicts: libavcodec/8svx.c libavcodec/alac.c libavcodec/cljr.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c libavcodec/dpxenc.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/ffv1dec.c libavcodec/flacdec.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/g726.c libavcodec/gif.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/h263dec.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopencore-amr.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/libvo-amrwbenc.c libavcodec/libvorbisenc.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/ljpegenc.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/proresdec_lgpl.c libavcodec/proresenc_kostya.c libavcodec/ra144enc.c libavcodec/rawdec.c libavcodec/rv10.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tta.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/wavpack.c libavcodec/xbmenc.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Group .name and .long_name together in codec/format declarationsDiego Biurrun2013-10-03
| |
* | avcodec/mpeg12dec: clear mpeg_enc_ctx_allocated when contexts are deallocatedMichael Niedermayer2013-09-14
| | | | | | | | | | | | Fixes Ticket2950 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg12dec: also print progressive seq and chroma formatMichael Niedermayer2013-08-18
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "Merge commit of 'vdpau: remove old-style decoders'"Michael Niedermayer2013-08-17
| | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit bf36dc50ea448999c8f8c7a35f6139a7040f6275, reversing changes made to b7fc2693c70fe72936e4ce124c802ac23857c476. Conflicts: libavcodec/h264.c Keeping support for the old VDPAU API has been requested by our VDPAU maintainer Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3'Michael Niedermayer2013-08-16
|\| | | | | | | | | | | | | | | | | | | * commit '38f64c03301ac66d7b54b3e4bd2bf6454f9fb2d3': mpeg12decdata.h: Move all tables to the only place they are used Conflicts: libavcodec/mpeg12decdata.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg12decdata.h: Move all tables to the only place they are usedDiego Biurrun2013-08-15
| |
* | avcodec/mpeg12dec: check slice size before trying to decode itMichael Niedermayer2013-08-13
| | | | | | | | | | | | Fixes assertion failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'Michael Niedermayer2013-08-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8': vdpau: remove old-style decoders Conflicts: libavcodec/allcodecs.c libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpeg12dec.c libavcodec/mpeg4videodec.c libavcodec/vc1dec.c libavcodec/vdpau.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 16:59:27 +0000