aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* 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>
| * libopencore-amr: Conditionally compile decoder and encoder bitsDiego Biurrun2013-02-171-1/+5
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17'Michael Niedermayer2013-02-181-44/+44
|\| | | | | | | | | | | | | * commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17': libopencore-amrnb: cosmetics: Group all encoder-related code together Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libopencore-amrnb: cosmetics: Group all encoder-related code togetherDiego Biurrun2013-02-171-44/+44
| | | | | | | | | | CC: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * dsputil: convert remaining op_pixels_funcLuca Barbato2013-02-173-5/+5
| | | | | | | | | | | | Convert to diffptr_t the line_size parameters still int. Remove all the warnings in dsputil.c
* | Merge commit '488f87be873506abb01d67708a67c10a4dd29283'Michael Niedermayer2013-02-183-6/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '488f87be873506abb01d67708a67c10a4dd29283': roqvideodec: check dimensions validity vqavideo: check chunk sizes before reading chunks qdm2: check array index before use, fix out of array accesses Conflicts: libavcodec/qdm2.c libavcodec/roqvideodec.c libavcodec/vqavideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * roqvideodec: check dimensions validityMichael Niedermayer2013-02-171-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3ae610451170cd5a28b33950006ff0bd23036845) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit fee26d352a52eb9f7fcd8d9167fb4a5ba015b612) CC: libav-stable@libav.org Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * vqavideo: check chunk sizes before reading chunksMichael Niedermayer2013-02-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes out of array writes Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit ab6c9332bfa1e20127a16392a0b85a4aa4840889) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 13093f9767b922661132a3c1f4b5ba2c7338b660) CC: libav-stable@libav.org Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * qdm2: check array index before use, fix out of array accessesMichael Niedermayer2013-02-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit a7ee6281f7ef1c29284e3a4cadfe0f227ffde1ed) CC: libav-stable@libav.org Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* | h264: don't store intra pcm samples in h->mb.Ronald S. Bultje2013-02-185-24/+22
| | | | | | | | | | | | | | | | | | 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: Michael Niedermayer <michaelni@gmx.at>
* | h264: don't initialize missing pictures when using VDPAU.Carl Eugen Hoyos2013-02-171-1/+2
| | | | | | | | | | | | This fixes an assertion failure when running mplayer -vc ffh264vdpau. Reported by irc user ioni.
* | h264: avoid calling get_format() multiple timesMichael Niedermayer2013-02-171-2/+8
| | | | | | | | | | | | | | | | | | | | Some applications do not like that. Fixes VDA Reduces noise for VDPAU Tested-by: Guillaume POIRIER <poirierg@gmail.com> Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Only set accelerated arm fft functions if fft is enabled.Carl Eugen Hoyos2013-02-172-0/+4
| | | | | | | | | | | | | | Fixes lavc compilation (linking) for configurations without fft. Reported-by: tyler wear Tested-by: Gavin Kinsey
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-171-0/+5
|\| | | | | | | | | | | | | * qatar/master: error_resilience: add required headers. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * error_resilience: add required headers.Anton Khirnov2013-02-171-0/+5
| |
* | lavc: fix codec_descriptor and pkt_timebase doxy.Clément Bœsch2013-02-171-2/+2
| |
* | lavc/utils: reindent in avcodec_decode_subtitle2() after f7963993.Clément Bœsch2013-02-171-10/+10
| |
* | lavc: support subtitles character encoding conversion.Clément Bœsch2013-02-174-5/+128
| |
* | lavc: mark bitmap based subtitles codecs as such.Clément Bœsch2013-02-173-1/+9
| |
* | lavc/tta: Use a safer check for encrypted streamsJames Almer2013-02-171-1/+1
| | | | | | | | | | | | | | | | | | The user can provide a password even when the stream is not encrypted, so check the value of s->format instead of s->pass in ttafilter_init(). Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | h264: don't initialize missing pictures when using a hwaccelHendrik Leppkes2013-02-171-1/+1
| | | | | | | | | | | | Writing into uninitialized hw surfaces is not supported and triggers an assert inside avpriv_color_frame Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-1635-1792/+2255
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: h264: deMpegEncContextize Conflicts: libavcodec/dxva2_h264.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_mb_template.c libavcodec/h264_parser.c libavcodec/h264_ps.c libavcodec/h264_refs.c libavcodec/h264_sei.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: deMpegEncContextizeAnton Khirnov2013-02-1534-1718/+2162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the changes are just trivial are just trivial replacements of fields from MpegEncContext with equivalent fields in H264Context. Everything in h264* other than h264.c are those trivial changes. The nontrivial parts are: 1) extracting a simplified version of the frame management code from mpegvideo.c. We don't need last/next_picture anymore, since h264 uses its own more complex system already and those were set only to appease the mpegvideo parts. 2) some tables that need to be allocated/freed in appropriate places. 3) hwaccels -- mostly trivial replacements. for dxva, the draw_horiz_band() call is moved from ff_dxva2_common_end_frame() to per-codec end_frame() callbacks, because it's now different for h264 and MpegEncContext-based decoders. 4) svq3 -- it does not use h264 complex reference system, so I just added some very simplistic frame management instead and dropped the use of ff_h264_frame_start(). Because of this I also had to move some initialization code to svq3. Additional fixes for chroma format and bit depth changes by Janne Grunau <janne-libav@jannau.net> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885'Michael Niedermayer2013-02-1612-62/+84
|\| | | | | | | | | | | | | | | | | | | * commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885': mpegvideo: split ff_draw_horiz_band(). Conflicts: libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: split ff_draw_horiz_band().Anton Khirnov2013-02-1512-62/+84
| | | | | | | | Split out dependency on MpegEncContext.
* | Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'Michael Niedermayer2013-02-1615-339/+450
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '54974c62982ae827becdbdb9b620b7ba75d079a0': error_resilience: decouple ER from MpegEncContext Conflicts: libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/h264.c libavcodec/mpegvideo.c libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * error_resilience: decouple ER from MpegEncContextAnton Khirnov2013-02-1515-335/+431
| |
* | Merge commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc'Michael Niedermayer2013-02-162-188/+183
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc': svq3: remove a pointless if() h264: remove a pointless if() Conflicts: libavcodec/h264.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * svq3: remove a pointless if()Anton Khirnov2013-02-151-122/+120
| | | | | | | | The H264 context is always uninitialized at this point.
| * h264: remove a pointless if()Anton Khirnov2013-02-151-65/+63
| | | | | | | | !encoding is always true, we do not have a H.264 encoder
* | Merge commit '68f930d2188aba5b32624887dcbf688c23482834'Michael Niedermayer2013-02-161-10/+8
|\| | | | | | | | | | | | | | | | | | | * commit '68f930d2188aba5b32624887dcbf688c23482834': h264: simplify calls to ff_er_add_slice(). Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h264: simplify calls to ff_er_add_slice().Anton Khirnov2013-02-151-10/+8
| | | | | | | | partitioned_frame is never set for h264 (as easily seen from git grep).
* | cinepack: print an error if cinepak_decode() failedMichael Niedermayer2013-02-161-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'Michael Niedermayer2013-02-161-1/+0
|\| | | | | | | | | | | | | | | | | | | * commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793': get_buffer(): do not initialize the data. Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * get_buffer(): do not initialize the data.Anton Khirnov2013-02-151-1/+0
| | | | | | | | | | There may be more decoders that rely on this. Those should be found and fixed.
* | h264: color frames grayMichael Niedermayer2013-02-161-0/+8
| | | | | | | | | | | | | | This prevents a regression from the removial of the buffer initialization Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: add avpriv_color_frame()Michael Niedermayer2013-02-162-0/+25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo_enc: draw edges on inputMichael Niedermayer2013-02-161-3/+12
| | | | | | | | | | | | Improves Motion estimation, avoids using out of picture areas for %16 != 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-02-151-5/+2
|\| | | | | | | | | | | | | * qatar/master: sparc: dsputil: Simplify high_bit_depth checks Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sparc: dsputil: Simplify high_bit_depth checksDiego Biurrun2013-02-151-5/+2
| |