Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/libavcodec/mlpdec.c
AgeCommit message (Collapse)Author
2020-02-08avcodec/mlpdec: use get_bits_long for huff lsbsJai Luthra
lsb bits may go beyond 25 bits, so to be safe use get_bits_long Signed-off-by: Jai Luthra <me@jailuthra.in> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2020-02-04mlp: check huff_lsbs only when codebook is usedJai Luthra
When no codebook is used, huff_lsbs can be more than 24 and still decode to original values once filters are applied. Signed-off-by: Jai Luthra <me@jailuthra.in>
2019-05-07avcodec/mlp_parser: split off shared code to its own fileJames Almer
Signed-off-by: James Almer <jamrial@gmail.com>
2019-02-24avcodec/mlpdec: Insuffient typoMichael Niedermayer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2018-05-26avcodec/mlpdec: Only change noise_type if the related fields are validMichael Niedermayer
Fixes: inconsistency Fixes:runtime error: index 8 out of bounds for type 'int32_t [8]' Fixes: 6686/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEHD_fuzzer-5191383498358784 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-10-30Merge commit '970c76f32283bddf3a5afd24fe52db7a96186244'James Almer
* commit '970c76f32283bddf3a5afd24fe52db7a96186244': mlp_parser: Drop in-parser downmix functionality Merged-by: James Almer <jamrial@gmail.com>
2017-10-30Merge commit '94c54d97e7f4fe90570c323803f2bdf6246c1010'James Almer
* commit '94c54d97e7f4fe90570c323803f2bdf6246c1010': mlp: Factor out channel layout subset checks Merged-by: James Almer <jamrial@gmail.com>
2017-10-30Merge commit '1f6e5dd4d4dd9c02371ad211049d27edb6d95286'James Almer
* commit '1f6e5dd4d4dd9c02371ad211049d27edb6d95286': mlp: Rename the channel layout variable Merged-by: James Almer <jamrial@gmail.com>
2017-06-04avcodec/mlpdec: Check quant_step_size against huff_lsbsMichael Niedermayer
This reorders the operations so as to avoid computations with the above arguments before they have been initialized. Fixes part of 1708/clusterfuzz-testcase-minimized-5035111957397504 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-27avcodec/mlpdec: Do not leave invalid values in matrix_out_ch[] on errorMichael Niedermayer
Fixes: runtime error: index 12 out of bounds for type 'uint8_t [8]' Fixes: 1832/clusterfuzz-testcase-minimized-6574546079449088 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-22avcodec/mlpdec: Fix runtime error: shift exponent -5 is negativeMichael Niedermayer
Fixes part of 1708/clusterfuzz-testcase-minimized-5035111957397504 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-20avcodec/mlpdec: Do not leave a invalid num_primitive_matrices in the contextMichael Niedermayer
Fixes: runtime error: index 8 out of bounds for type 'uint8_t [8]' Fixes: 1699/clusterfuzz-testcase-minimized-6327177438035968 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-18avcodec/mlpdec: Fix: runtime error: left shift of negative value -8Michael Niedermayer
Fixes: 1658/clusterfuzz-testcase-minimized-4889937130291200 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-17avcodec/mlpdec: Fix runtime error: left shift of negative value -1Michael Niedermayer
Fixes: 1636/clusterfuzz-testcase-minimized-5310494757879808 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-14avcodec/mlpdec: Check that there is enough data for headersMichael Niedermayer
Fixes: out of array access Fixes: 1541/clusterfuzz-testcase-minimized-6403410590957568 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-13avcodec/mlp: Fix multiple runtime error: left shift of negative value -1Michael Niedermayer
Fixes: 1512/clusterfuzz-testcase-minimized-4713846423945216 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-05-06avcodec/mlpdec: Fix runtime error: left shift of negative value -22Michael Niedermayer
Fixes: 1355/clusterfuzz-testcase-minimized-6662205472768000 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-04-27mlp_parser: Drop in-parser downmix functionalityVittorio Giovara
request_channel_layout is a decoder option and it makes no sense to have it in a parser. This feature was needed in the past when the decoder was allowed to reuse the avctx from the demuxer. Nowadays the decoder receives only the parameters from it, already containing the real channel layout (and the correct request_channel_layout option). After initialization the decoder overwrites the channel layout with the downmixed one that is actually output, so there is no need to preserve this functionality in the parser. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2017-04-26mlp: Factor out channel layout subset checksVittorio Giovara
2017-04-26mlp: Rename the channel layout variableVittorio Giovara
Purely cosmetic change, will make code more readable once the new channel layout takes over.
2017-02-07Use bitstream_init8() where appropriateDiego Biurrun
2016-12-19mlp: Convert to the new bitstream readerAlexandra Hájková
2015-09-29mlpdec: Fix a undefined left shift of negative numberGanesh Ajjanagadde
This fixes a -Wshift-negative-value warning reported with clang 3.7+. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
2015-09-20avcodec/mlpdec: fix a undefined left shift of negative numberGanesh Ajjanagadde
This fixes a -Wshift-negative-value reported with clang 3.7+, e.g http://fate.ffmpeg.org/log.cgi?time=20150918181527&log=compile&slot=x86_64-darwin-clang-polly-vectorize-stripmine-3.7. Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-05Merge commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c'Hendrik Leppkes
* commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c': lavc: Drop deprecated request_channels related functions Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-08-28lavc: Drop deprecated request_channels related functionsVittorio Giovara
Deprecated in 04/2011.
2015-07-27Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer
* commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-27lavc: AV-prefix all codec capabilitiesVittorio Giovara
Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-03-11mlpdec: support TrueHD streams with an Atmos substreamHendrik Leppkes
The fourth substream is being discarded, since its not raw audio data, but an encoded Atmos stream which needs a specialized decoder. Fixes decoding of the true hd stream from Transformers\ -\ Age\ of\ Extinction\ 2014\ 1080P-003.mkv Signed-off-by: Anton Khirnov <anton@khirnov.net>
2015-03-11mlpdec: support major sync headers with optional extension blocksHendrik Leppkes
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2014-11-13Merge commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834'Michael Niedermayer
* commit '2ffb0598dbdb81c40650952aa9299fa02fa5e834': mlpdec: check for negative index Conflicts: libavcodec/mlpdec.c See: 8491ac3ad2e9fc92479d6fc42d6ee4cb8d6f61d3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13mlpdec: check for negative indexVittorio Giovara
CC: libav-stable@libav.org Bug-Id: CID 970924
2014-10-03x86/mlpdec: add ff_mlp_rematrix_channel_{sse4,avx2}James Almer
2x to 2.5x faster than the C version. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
2014-10-03mlpdec: move rematrix_channels code to output_data()James Almer
Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
2014-09-21mlpdec: support TrueHD streams with an Atmos substreamHendrik Leppkes
The fourth substream is being discarded, since its not raw audio data, but an encoded Atmos stream which needs a specialized decoder. Fixes decoding of the true hd stream from Transformers\ -\ Age\ of\ Extinction\ 2014\ 1080P-003.mkv Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-21mlpdec: support major sync headers with optional extension blocksHendrik Leppkes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-25avcodec/mlpdec: fix () in MSB_MASK() macroMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26Merge commit 'fcf5fc444522d24caa9907225802817ae788f511'Michael Niedermayer
* commit 'fcf5fc444522d24caa9907225802817ae788f511': truehd: tune VLC decoding for ARM. Conflicts: libavcodec/mlpdec.c See: e555e1bc39ea71d46a07d0bb847fb426c2dd4d80 Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26truehd: break out part of output_data into platform-specific callback.Ben Avison
Verified with profiling that this doesn't have a measurable effect upon overall performance. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26truehd: break out part of rematrix_channels into platform-specific callback.Ben Avison
Verified with profiling that this doesn't have a measurable effect upon overall performance. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-26truehd: break out part of output_data into platform-specific callback.Ben Avison
Verified with profiling that this doesn't have a measurable effect upon overall performance. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-26truehd: tune VLC decoding for ARM.Ben Avison
Profiling on a Raspberry Pi revealed the best performance to correspond with VLC_BITS = 5. Results for overall audio decode and the get_vlc2 function in particular are as follows: Before After Mean StdDev Mean StdDev Confidence Change 6:2 total 348.8 20.1 339.6 15.1 88.8% +2.7% (insignificant) 6:2 function 38.1 8.1 26.4 4.1 100.0% +44.5% 8:2 total 339.1 15.4 324.5 15.5 99.4% +4.5% 8:2 function 33.8 7.0 27.3 5.6 99.7% +23.6% 6:6 total 604.6 20.8 572.8 20.6 100.0% +5.6% 6:6 function 95.8 8.4 68.9 8.2 100.0% +39.1% 8:8 total 766.4 17.6 741.5 21.2 100.0% +3.4% 8:8 function 106.0 11.4 86.1 9.9 100.0% +23.1% Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-26truehd: break out part of rematrix_channels into platform-specific callback.Ben Avison
Verified with profiling that this doesn't have a measurable effect upon overall performance. Signed-off-by: Martin Storsjö <martin@martin.st>
2014-03-20truehd: tune VLC decoding for ARM.Ben Avison
Profiling on a Raspberry Pi revealed the best performance to correspond with VLC_BITS = 5. Results for overall audio decode and the get_vlc2 function in particular are as follows: Before After Mean StdDev Mean StdDev Confidence Change 6:2 total 348.8 20.1 339.6 15.1 88.8% +2.7% (insignificant) 6:2 function 38.1 8.1 26.4 4.1 100.0% +44.5% 8:2 total 339.1 15.4 324.5 15.5 99.4% +4.5% 8:2 function 33.8 7.0 27.3 5.6 99.7% +23.6% 6:6 total 604.6 20.8 572.8 20.6 100.0% +5.6% 6:6 function 95.8 8.4 68.9 8.2 100.0% +39.1% 8:8 total 766.4 17.6 741.5 21.2 100.0% +3.4% 8:8 function 106.0 11.4 86.1 9.9 100.0% +23.1% Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-08mlpdec: fix request_channel_layout behavior.Michael Niedermayer
When request_channel_layout is 0, all substreams should be decoded. Signed-off-by: Tim Walker <tdskywalker@gmail.com>
2014-02-08avcodec/mlpdec: fix mulichannel outputMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-08Merge commit 'c0c45188e56cfa3050bb39f8299025345b8a204c'Michael Niedermayer
* commit 'c0c45188e56cfa3050bb39f8299025345b8a204c': mlp: improve request_channel_layout behavior. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-02-08mlp: improve request_channel_layout behavior.Tim Walker
Don't decode further substreams if request_channel_layout is a subset of the current substream's channel_layout. Before, we would only discard further substreams if request_channel_layout matched the substream's channel_layout extactly, thus decoding additional channels which the caller would probably end up downmixing.
2014-01-06Merge commit 'e92123093dfdca0ef6608998240e2f9345d63bff'Michael Niedermayer
* commit 'e92123093dfdca0ef6608998240e2f9345d63bff': mlpdec: set AV_FRAME_DATA_MATRIXENCODING side data. Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-06Merge commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09'Michael Niedermayer
* commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09': mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for each substream. Conflicts: libavcodec/mlp_parser.h libavcodec/mlpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-04 22:15:16 +0300