summaryrefslogtreecommitdiff
path: root/libavcodec/vc1dec.c
Commit message (Collapse)AuthorAge
* Merge remote branch 'qatar/master'Michael Niedermayer2011-05-05
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) doc: Check standalone compilation before submitting new components. Fix standalone compilation of pipe protocol. Fix standalone compilation of ac3_fixed encoder. Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders. Fix standalone compilation of IMC decoder. Fix standalone compilation of WTV demuxer. Fix standalone compilation of MXPEG decoder. flashsv: K&R cosmetics matroskaenc: fix memory leak vc1: make overlap filter for I-frames bit-exact. vc1dec: use s->start/end_mb_y instead of passing them as function args. Revert "VC1: merge idct8x8, coeff adjustments and put_pixels." Replace strncpy() with av_strlcpy(). indeo3: Eliminate use of long. get_bits: make cache unsigned to eliminate undefined signed overflow. asfdec: fix assert failure on invalid files avfilter: check malloc return values. Not pulled as reason for reindent is not pulled: mpegvideo: reindent. nutenc: check malloc return values. Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0). ... Conflicts: doc/developer.texi libavcodec/Makefile libavcodec/get_bits.h libavcodec/mpegvideo.c libavformat/Makefile libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: make overlap filter for I-frames bit-exact.Ronald S. Bultje2011-05-04
| |
| * vc1dec: use s->start/end_mb_y instead of passing them as function args.Ronald S. Bultje2011-05-04
| |
| * Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."Ronald S. Bultje2011-05-04
| | | | | | | | | | | | | | This reverts commit f8bed30d8b176fa030f6737765338bb4a2bcabc9. The reason for this is that the overlap filter, which runs after IDCT, should run on unclamped values, and thus IDCT and put_pixels() cannot be merged if we want to attempt to be bitexact.
| * Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.Stefano Sabatini2011-05-02
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*Stefano Sabatini2011-05-02
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-27
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * lavc: remove FF_API_HURRY_UP cruftAnton Khirnov2011-04-26
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3dec: fix processing of delta bit allocation information. vc1: fix fate-vc1 after previous commit. wmv3dec: fix playback of complex WMV3 files using simple_idct. make av_dup_packet() more cautious on allocation failures make containers pass palette change in AVPacket introduce side information for AVPacket Politic commits that have not been pulled: Update regtest checksums after revision 6001dad. Replace more FFmpeg references by Libav. Replace references to ffmpeg-devel with libav-devel; fix roundup URL. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: fix fate-vc1 after previous commit.Ronald S. Bultje2011-04-17
| | | | | | | | | | | | | | | | PROFILE_ADVANCED doesn't set res_fasttx, so make that a special case in the condition that decides which IDCT to use (and whether to read coefficients transposed or not). Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * wmv3dec: fix playback of complex WMV3 files using simple_idct.Ronald S. Bultje2011-04-16
| | | | | | | | | | | | | | | | IDCT coefficients are read transposed, but simple_idct does not expect this. Therefore, only do tranposed coefficient reading if we're not using simple_idct. Fixes http://forum.videolan.org/viewtopic.php?f=14&t=89651
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avio: add more documentation for AVIOContext. Parse sprite data for WMVP and WVP2, and decode sprites for the latter Replace outdated info on the FAQ Redefine sameq pad: fix example explanation gradfun: add notice from the MPlayer manual eval: add support for trunc, ceil, and floor functions documentation: add setdar and setsar description to filters.texi avio: document some members of AVIOContext. avio: document avio_close(). avio: cosmetics, vertically align comments. avio: cosmetics, group the reading functions. avio: cosmetics, merge all the FF_API_OLD_AVIO blocks. avio: cosmetics, move AVIOContext to start of the file. avio: update file header. os: fix OpenBSD/PowerPC compilation pixfmt: add PIX_FMT_BGR48LE and PIX_FMT_BGR48BE oggdec: fix demuxing chained audio streams fix typo Conflicts: doc/filters.texi libavformat/avio.h libavutil/pixfmt.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Parse sprite data for WMVP and WVP2, and decode sprites for the latterAlberto Delmás2011-04-10
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Communicate pulldown flags to clients to fix VC-1 playback with pulldown contentAlexandre Colucci2011-04-04
| | | | | | | | | | | | The pulldown flags should be communicated to the client of the libavcodec library. Not doing so causes jerky playback with pulldown content. Note that this change requires the patch previously provided here: http://ffmpeg.org/pipermail/ffmpeg-devel/2011-April/110314.html Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fixed-point MDCT with 32-bit unscaled output lavc: deprecate rate_emu lavc: mark hurry_up for removal on next major bump parser: mark av_parser_parse() for removal on next major bump lavc: add missing audioconvert includes jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: mark hurry_up for removal on next major bumpAnton Khirnov2011-04-02
| | | | | | | | | | It has been deprecated for about five years, skip_idct/skip_frame should be used instead.
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * newdev/master: (33 commits) Fix an infinite loop when RoQ encoded generated a frame with a size greater than the maximum valid size. Add kbdwin.o to AC3 decoder Detect byte-swapped AC-3 and support decoding it directly. cosmetics: indentation Always copy input data for AC3 decoder. ac3enc: make sym_quant() branch-free cosmetics: indentation Add a CPU flag for the Atom processor. id3v2: skip broken tags with invalid size id3v2: don't explicitly skip padding Make sure kbhit() is in conio.h fate: update wmv8-drm reference vc1: make P-frame deblock filter bit-exact. configure: Add the -D parameter to the dlltool command amr: Set the AVFMT_GENERIC_INDEX flag amr: Set the pkt->pos field properly to the start of the packet amr: Set the codec->bit_rate field based on the last packet rtsp: Specify unicast for TCP interleaved streams, too Set the correct target for mingw64 dlltool applehttp: Change the variable for stream position in seconds into int64_t ... Conflicts: ffmpeg.c ffplay.c libavcodec/ac3dec.c libavformat/avio.h libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: make P-frame deblock filter bit-exact.Ronald S. Bultje2011-03-21
| |
| * vc1: slice support.Ronald S. Bultje2011-03-21
| | | | | | | | Also reset coded_block at each new slice, fixes problems in slice playback.
| * vc1: fix up memleaks in the error codepath.Ronald S. Bultje2011-03-21
| | | | | | | | | | Introduce end: and err: labels at the end of vc1_decode_frame(), which will clean up allocated memory consistently.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* VC1: Export profile/levelHendrik Leppkes2011-03-12
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* vc1: fix decoding when end sequence is presentBaptiste Coudurier2011-03-02
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* VC1: merge idct8x8, coeff adjustments and put_pixels.Ronald S. Bultje2011-02-21
| | | | | Merging these functions allows merging some loops, which makes the results (particularly after SIMD optimizations) much faster.
* VC1: inline vc1_put_block() in vc1_decode_i_blocks().Ronald S. Bultje2011-02-21
| | | | | | Advantage is that it allows us to combine several loops into a single one, and these can eventually be merged into the IDCT itself. Also, it allows us to remove vc1_put_block(), and makes CODEC_FLAG_GRAY faster.
* VC1: don't use vc1_put_block() in vc1_decode_i_blocks_adv().Ronald S. Bultje2011-02-20
| | | | | | | | Advanced profile never uses "range reduction", so vc1_put_block() quite literally just calls put_pixels_clamped() from vc1_decode_i_blocks_adv(). By inlining the function, we can prevent calling IDCT8x8 if CODEC_FLAG_GRAY is set, and we don't have to scale the coeffs in the [0,256] range, but can instead use put_signed_pixels_clamped().
* Fix invalid reads in VC1 decoderReimar Döffinger2011-02-19
| | | | Patch discussed and taken from https://roundup.ffmpeg.org/issue2584
* dsputil: move VC1-specific stuff into VC1DSPContext.Ronald S. Bultje2011-02-17
|
* VC1: simplify a calculation in a loop.Ronald S. Bultje2011-02-17
|
* VC1: transpose IDCT 8x8 coeffs while reading.Ronald S. Bultje2011-02-17
|
* Move ff_emulated_edge_mc() into DSPContext.Ronald S. Bultje2011-01-28
|
* Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-26
| | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Make WMV3 decoder attempt to decode WMVP as wellKostya Shishkov2010-09-26
| | | | Originally committed as revision 25209 to svn://svn.ffmpeg.org/ffmpeg/trunk
* vc1: Fix ordering of loop filter for I/B framesDavid Conrad2010-07-11
| | | | | | All horizontal edges must be filtered before all vertical edges Originally committed as revision 24206 to svn://svn.ffmpeg.org/ffmpeg/trunk
* vc1: ff_draw_horiz_band needs a one row delay when the loop filter is activeDavid Conrad2010-07-11
| | | | Originally committed as revision 24205 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make WMV3 decoder print more errors when decoding beta WMV9 files.Kostya Shishkov2010-07-10
| | | | | | As a side effect it will also decode a lot of P-frames from those. Originally committed as revision 24161 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change type of zz_table to uint8_t to match the scantables it points to.Reimar Döffinger2010-06-27
| | | | Originally committed as revision 23831 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 321l: do not use shifted s->linesize instead of correct s->uvlinesize.Kostya Shishkov2010-05-29
| | | | | | This should fix chroma issues in WMV3/VC-1 decoder with avfilter enabled. Originally committed as revision 23370 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-20
| | | | | | | | 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
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* ff_msmpeg4_decode_init() calls ff_h263_decode_init() which callsKostya Shishkov2010-02-24
| | | | | | | | MPV_common_init(), so calling both is redundant and leads to memory leaks in WMV3/VC-1 decoder. Thus use only the first function in WMV3/VC-1 decoder initialization. Originally committed as revision 22024 to svn://svn.ffmpeg.org/ffmpeg/trunk
* VC1: fix missing include h263.hMåns Rullgård2010-02-21
| | | | Originally committed as revision 21932 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move AVCodecs from h263dec.c to msmpeg4.c and disentangle init decode init.Michael Niedermayer2010-01-08
| | | | Originally committed as revision 21102 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Warn when WVC1 cannot be decodedKostya Shishkov2009-10-11
| | | | Originally committed as revision 20201 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Since some junk may be or may be not present before actual VC-1 extradata,Andrew Dennison2009-10-06
| | | | | | | | | search for real extradata start instead of always skipping one byte. Patch by Andrew Dennison gmailify(${name}d, lists) Thread: [PATCH] Fix VC1 "Incomplete extradata" for mkv files generated by eac3to Originally committed as revision 20178 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use ff_msmpeg4_decode_init to initialize ff_msmp4_mb_i_vlc since staticReimar Döffinger2009-09-24
| | | | | | | | | VLC tables should only be initialized from one place. This initializes/calculates more VLC tables than necessary for VC1 decoding, but this is only done once and only a small overhead in time and space (maybe 30 kB) it seems not worth adding a separate function. Originally committed as revision 20010 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Mark all pix_fmts and supported_framerates compound literals as const.Reimar Döffinger2009-09-06
| | | | | | Makes no difference for gcc but at least icc can put them in .rodata then. Originally committed as revision 19789 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Only enable WMV3 decoder when it has been turned on in the build system.Diego Biurrun2009-07-29
| | | | Originally committed as revision 19534 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do not check for both CONFIG_VC1_VDPAU_DECODER and CONFIG_WMV3_VDPAU_DECODER,Diego Biurrun2009-07-29
| | | | | | the former depends upon the latter. Originally committed as revision 19532 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Edge emulation should be used in B-frame MC in mspel mode withKostya Shishkov2009-06-23
| | | | | | mv_x < 1 or mv_y < 1. Originally committed as revision 19255 to svn://svn.ffmpeg.org/ffmpeg/trunk