summaryrefslogtreecommitdiffstats
path: root/libavcodec
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '205fdd4ea5e1264946917a26fde01e137a485f5a'Michael Niedermayer2014-06-113-0/+15
|\ | | | | | | | | | | | | * commit '205fdd4ea5e1264946917a26fde01e137a485f5a': ppc: Fix runtime CPU detection for apedsp, huffyuvdsp, svq1enc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ppc: Fix runtime CPU detection for apedsp, huffyuvdsp, svq1encDiego Biurrun2014-06-103-0/+15
| |
* | Fix standalone compilation of the webvtt encoder.Carl Eugen Hoyos2014-06-101-1/+1
| |
* | Merge commit '570d4b21863b6254d6bbca9c528bede471bb4478'Michael Niedermayer2014-06-101-5/+5
|\ \ | |/ | | | | | | | | | | * commit '570d4b21863b6254d6bbca9c528bede471bb4478': x86: h264: Don't keep data in the redzone across function calls on 64 bit unix Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * x86: h264: Don't keep data in the redzone across function calls on 64 bit unixMartin Storsjö2014-06-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We know that the called function (ff_chroma_inter_body_mmxext) doesn't touch the redzone, and thus will be kept intact - thus, this doesn't fix any bug per se. However, valgrind's memcheck tool intentionally assumes that the redzone is clobbered on every function call and function return (see a long comment in valgrind/memcheck/mc_main.c). This avoids false positives in that tool, at the cost of an extra stack pointer adjustment. The other alternative would be a valgrind suppression for this issue, but that's an extra burden for everybody that wants to run libavcodec within valgrind. Signed-off-by: Martin Storsjö <martin@martin.st>
| * adpcm: Write the proper predictor in trellis mode in IMA QTMartin Storsjö2014-06-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual predictor value, set by the trellis code, never was written back into the variable that was written into the block header. This was accidentally removed in b304244b. This significantly improves the audio quality of the trellis case, which was plain broken since b304244b. Encoding IMA QT with trellis still actually gives a slightly worse quality than without trellis, since the trellis encoder doesn't use the exact same way of rounding as in adpcm_ima_qt_compress_sample and adpcm_ima_qt_expand_nibble. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
| * adpcm: Avoid reading out of bounds in the IMA QT trellis encoderMartin Storsjö2014-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | This was broken in 095be4fb - samples+ch (for the previous non-planar case) equals &samples_p[ch][0]. The confusion probably stemmed from the IMA WAV case where it originally was &samples[avctx->channels + ch], which was correctly changed into &samples_p[ch][1]. CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
* | avcodec/x86/dct_init: fix build failure with clang && disable-optimizationsMichael Niedermayer2014-06-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utvideoenc: skip unused huffman entriesMichael Niedermayer2014-06-091-1/+1
| | | | | | | | | | | | This very slightly improves compression Found-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utvideodec: fix use of get_vlc2()Michael Niedermayer2014-06-091-1/+1
| | | | | | | | | | | | | | The max depth is 3 Found-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/huffman/ff_huff_gen_len_table: support skiping stat=0 entriesMichael Niedermayer2014-06-094-10/+19
| | | | | | | | | | | | | | This is probably not the simplest solution but as this is needed for a bugfix, simplification is left for later. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/utvideodec: Increase vlc lenCarl Eugen Hoyos2014-06-091-1/+1
| | | | | | | | | | | | | | Fixes a regression since fb3e380 similar to ticket #2661, reported by fluffrabbit at aol dot com. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cavsdec: fix qp fixed slice handlingMichael Niedermayer2014-06-092-1/+3
| | | | | | | | | | | | Fixes Ticket3400 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/dct32: don't build ff_dct32_float_sse on x86_64James Almer2014-06-092-1/+3
| | | | | | | | | | | | | | | | There's an SSE2 version already, and technically the SSE version on x86_64 was wrong (using pshufd and pshuflw, SSE2 instructions). Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/options_table: improve max/min rate help textMichael Niedermayer2014-06-081-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pthread_slice: Use av_malloc(z)_array()Michael Niedermayer2014-06-081-4/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/pthread_frame: Use av_mallocz_array()Michael Niedermayer2014-06-081-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: fix () in TRANSPOSE macroMichael Niedermayer2014-06-082-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/aacpsy: Use av_mallocz_array()Michael Niedermayer2014-06-081-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/alsdec: Clear MPEG4AudioConfig so that no use of uninitialized ↵Michael Niedermayer2014-06-081-1/+1
| | | | | | | | | | | | memory is possible Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | x86/vp9: inital AVX2 intra_predJames Almer2014-06-084-9/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tos3k-vp9-b10000.webm on a Core i5-4200U @1.6GHz 1219 decicycles in ff_vp9_ipred_dc_32x32_ssse3, 131070 runs, 2 skips 439 decicycles in ff_vp9_ipred_dc_32x32_avx2, 131070 runs, 2 skips 3570 decicycles in ff_vp9_ipred_dc_top_32x32_ssse3, 4096 runs, 0 skips 2494 decicycles in ff_vp9_ipred_dc_top_32x32_avx2, 4096 runs, 0 skips 1419 decicycles in ff_vp9_ipred_dc_left_32x32_ssse3, 16384 runs, 0 skips 717 decicycles in ff_vp9_ipred_dc_left_32x32_avx2, 16384 runs, 0 skips 2737 decicycles in ff_vp9_ipred_tm_32x32_avx, 1024 runs, 0 skips 2088 decicycles in ff_vp9_ipred_tm_32x32_avx2, 1024 runs, 0 skips 3090 decicycles in ff_vp9_ipred_v_32x32_avx, 512 runs, 0 skips 2226 decicycles in ff_vp9_ipred_v_32x32_avx2, 512 runs, 0 skips 1565 decicycles in ff_vp9_ipred_h_32x32_avx, 1024 runs, 0 skips 922 decicycles in ff_vp9_ipred_h_32x32_avx2, 1024 runs, 0 skips Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/hevc_sei: fix invalid get_bits() in a commentMichael Niedermayer2014-06-071-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tscc2: fix macro ()Michael Niedermayer2014-06-071-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/tta: fix macro ()Michael Niedermayer2014-06-072-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/vorbisdec: Reset first_frameMichael Niedermayer2014-06-071-0/+1
| | | | | | | | | | | | | | | | This avoids returning a initial frame after seeking which does not match what would be received when decoding from the begin. Suggested-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libvpxenc: update the ranges for "cpu_used" so it matches the ↵Michael Niedermayer2014-06-061-3/+2
| | | | | | | | | | | | | | "speed" alias Reviewed-by: James Zern <jzern@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/libvpxenc: Update the "cpu-used" options default to match the ↵Rafaël Carré2014-06-061-1/+1
| | | | | | | | | | | | | | "speed" alias Reviewed-by: James Zern <jzern@google.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362'Michael Niedermayer2014-06-061-1/+4
|\ \ | |/ | | | | | | | | | | * commit 'f558f0d2da9426c7f5ba346b5b8e6eb720148362': avcodec options: add enum option for color_range Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec options: add enum option for color_rangeMarc-Antoine Arnaud2014-06-061-1/+4
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c'Michael Niedermayer2014-06-061-1/+11
|\ \ | |/ | | | | | | | | | | * commit '7c29b7229bedf0c37d09bd02dab88e563adffd3c': avcodec options: add enum option for colorspace Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec options: add enum option for colorspaceMarc-Antoine Arnaud2014-06-061-1/+11
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'efc2dfe6a0238ec08769626db899ea910be24407'Michael Niedermayer2014-06-061-1/+15
|\ \ | |/ | | | | | | | | | | * commit 'efc2dfe6a0238ec08769626db899ea910be24407': avcodec options: add enum option for color_trc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec options: add enum option for color_trcMarc-Antoine Arnaud2014-06-061-1/+15
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | Merge commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10'Michael Niedermayer2014-06-061-1/+9
|\ \ | |/ | | | | | | | | | | * commit 'bd71c300f9ba7f9875bb5df17ce522e9128bae10': avcodec options: add enum option for color_primaries Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec options: add enum option for color_primariesMarc-Antoine Arnaud2014-06-061-1/+9
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | avcodec/mpeg12enc: store sequence display extension only if we have ↵Michael Niedermayer2014-06-061-11/+15
| | | | | | | | | | | | something to store in it Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '8a06794112d02a5707f766b8b38a5d50dfd03898'Michael Niedermayer2014-06-061-0/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a06794112d02a5707f766b8b38a5d50dfd03898': mpeg2: add sequence display extension information Conflicts: libavcodec/mpeg12enc.c tests/ref/lavf/gxf tests/ref/lavf/mxf tests/ref/lavf/mxf_d10 tests/ref/lavf/ts tests/ref/seek/lavf-gxf tests/ref/seek/lavf-mxf tests/ref/seek/lavf-ts tests/ref/seek/vsynth2-mpeg2-422 tests/ref/seek/vsynth2-mpeg2-idct-int tests/ref/seek/vsynth2-mpeg2-ilace tests/ref/seek/vsynth2-mpeg2-ivlc-qprd tests/ref/seek/vsynth2-mpeg2-thread tests/ref/seek/vsynth2-mpeg2-thread-ivlc tests/ref/vsynth/vsynth1-mpeg2 tests/ref/vsynth/vsynth1-mpeg2-422 tests/ref/vsynth/vsynth1-mpeg2-idct-int tests/ref/vsynth/vsynth1-mpeg2-ilace tests/ref/vsynth/vsynth1-mpeg2-ivlc-qprd tests/ref/vsynth/vsynth1-mpeg2-thread tests/ref/vsynth/vsynth1-mpeg2-thread-ivlc tests/ref/vsynth/vsynth2-mpeg2 tests/ref/vsynth/vsynth2-mpeg2-422 tests/ref/vsynth/vsynth2-mpeg2-idct-int tests/ref/vsynth/vsynth2-mpeg2-ilace tests/ref/vsynth/vsynth2-mpeg2-ivlc-qprd tests/ref/vsynth/vsynth2-mpeg2-thread tests/ref/vsynth/vsynth2-mpeg2-thread-ivlc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg2: add sequence display extension informationMarc-Antoine Arnaud2014-06-061-0/+12
| | | | | | | | Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* | huffyuvdec: trick for plane decoding <= 14bitsChristophe Gisquet2014-06-061-23/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the code to minimize code duplication. Before: 130870 decicycles in g, 1048139 runs, 437 skips 10bits: 9.048 12bits: 10.733 After: 126960 decicycles in g, 1048136 runs, 440 skips 10bits: 8.642 12bits: 9.656 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/adpcmenc: fix integer overflow / undefined behavior in STORE_NODE()Michael Niedermayer2014-06-061-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | adpcm: Write the proper predictor in trellis mode in IMA QTMartin Storsjö2014-06-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The actual predictor value, set by the trellis code, never was written back into the variable that was written into the block header. This was accidentally removed in b304244b. This significantly improves the audio quality of the trellis case, which was plain broken since b304244b. Encoding IMA QT with trellis still actually gives a slightly worse quality than without trellis, since the trellis encoder doesn't use the exact same way of rounding as in adpcm_ima_qt_compress_sample and adpcm_ima_qt_expand_nibble. Fixes part of Ticket3701 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | adpcm: Fix trellis encoding of IMA QTMartin Storsjö2014-06-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This was broken in 095be4fb - samples+ch (for the previous non-planar case) equals &samples_p[ch][0]. The confusion probably stemmed from the IMA WAV case where it originally was &samples[avctx->channels + ch], which was correctly changed into &samples_p[ch][1]. Fixes part of Ticket3701 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wma lossless: reuse scalarproduct_and_madd_int16Christophe Gisquet2014-06-061-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done by padding the coefficient buffer with 0s, because the order may be only a multiple of 4, and the DSP function requires batches of 8. However, no sample with such a case was found, so request one if it uses that kind of order. Approximate relative speedup depending on instruction set: plain C: -6% mmxext: 51% sse2: 54% Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2f7065190ad48744014a02288799d03adfa613e0'Michael Niedermayer2014-06-062-44/+20
|\ \ | |/ | | | | | | | | | | * commit '2f7065190ad48744014a02288799d03adfa613e0': libfdk-aac: Relicense the library wrappers to the ISC license Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libfdk-aac: Relicense the library wrappers to the ISC licenseMartin Storsjö2014-06-062-44/+20
| | | | | | | | | | | | | | | | | | | | | | This reduces the number of different licenses used within libav, and is preferrable since it has less ambiguous wordings than the BSD license with respect to the duties of the user of the code. Fraunhofer have now indicated that they're allowed to contribute code under this license as well. Signed-off-by: Martin Storsjö <martin@martin.st>
* | x86/dsputil: move some mmx init code inside dsputil_init_mmx()James Almer2014-06-061-20/+18
| | | | | | | | | | | | | | This reduces differences with the fork Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Improve intel jpeg flip heuristicMichael Niedermayer2014-06-061-1/+1
| | | | | | | | | | | | Fixes Ticket3698 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/aic: fix quantization table permutationMichael Niedermayer2014-06-051-4/+7
| | | | | | | | | | | | Fixes Ticket3700 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mpegaudiodec: Reset dither and mdct stateMichael Niedermayer2014-06-051-0/+2
| | | | | | | | | | | | | | This makes the mp3 decoder produce the same result when repeatly flushing and decoding Suggested-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | apedsp: move to llauddspChristophe Gisquet2014-06-0512-43/+73
| | | | | | | | | | | | APE is not the sole codec using scalarproduct_and_madd_int16. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud