summaryrefslogtreecommitdiff
path: root/libavcodec/mlp_parser.c
Commit message (Collapse)AuthorAge
* avcodec/mlp_parser: Check if synccode is within bufferMichael Niedermayer2018-08-03
| | | | | | | | Fixes: undefined shift Fixes: 9216/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEHD_fuzzer-6281404575907840 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/mlp_parser: reindent after last commitJames Almer2018-01-29
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* avcodec/mlp_parser: don't try to combine frames when full frames are providedJames Almer2018-01-29
| | | | | | | Attempting full frame reconstruction is unnecessary for non raw containers, so just skip it altogether. Signed-off-by: James Almer <jamrial@gmail.com>
* Merge commit '970c76f32283bddf3a5afd24fe52db7a96186244'James Almer2017-10-30
|\ | | | | | | | | | | | | * commit '970c76f32283bddf3a5afd24fe52db7a96186244': mlp_parser: Drop in-parser downmix functionality Merged-by: James Almer <jamrial@gmail.com>
| * mlp_parser: Drop in-parser downmix functionalityVittorio Giovara2017-04-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge commit '94c54d97e7f4fe90570c323803f2bdf6246c1010'James Almer2017-10-30
|\| | | | | | | | | | | | | * commit '94c54d97e7f4fe90570c323803f2bdf6246c1010': mlp: Factor out channel layout subset checks Merged-by: James Almer <jamrial@gmail.com>
| * mlp: Factor out channel layout subset checksVittorio Giovara2017-04-26
| |
* | Merge commit 'cea7fd9afb8488a6c48f7d7ee38602e1fd3dd425'James Almer2017-10-30
|\| | | | | | | | | | | | | * commit 'cea7fd9afb8488a6c48f7d7ee38602e1fd3dd425': mlp: Drop ff_ prefix from a static function Merged-by: James Almer <jamrial@gmail.com>
| * mlp: Drop ff_ prefix from a static functionVittorio Giovara2017-04-26
| |
| * Use bitstream_init8() where appropriateDiego Biurrun2017-02-07
| |
| * mlp: Convert to the new bitstream readerAlexandra Hájková2016-12-19
| |
* | Merge commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c'Hendrik Leppkes2015-09-05
|\| | | | | | | | | | | | | * commit 'dc70c19476e76f1118df73b5d97cc76f0e5f6f6c': lavc: Drop deprecated request_channels related functions Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * lavc: Drop deprecated request_channels related functionsVittorio Giovara2015-08-28
| | | | | | | | Deprecated in 04/2011.
| * mlpdec: support major sync headers with optional extension blocksHendrik Leppkes2015-03-11
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | mlpdec: support major sync headers with optional extension blocksHendrik Leppkes2014-09-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mlp_parser: check ff_combine_frame() return codeMichael Niedermayer2014-07-04
| | | | | | | | | | | | Fixes CID602338 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2014-02-09
|\| | | | | | | | | | | | | | | | | | | | | * qatar/master: mlp_parser: fix request_channel_layout behavior. Conflicts: libavcodec/mlp_parser.c See: bd35d58463f01f7781df052864ae16f5e228c1bc Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlp_parser: fix request_channel_layout behavior.Tim Walker2014-02-08
| | | | | | | | | | | | | | | | | | | | | | When request_channel_layout is 0, all substreams should be decoded. Thanks to Michael Niedermayer for spotting. Also fix a mismatch between the parser and decoder when request_channel_layout is a subset of Stereo.
* | avcodec/mlp_parser: fix multichannelMichael Niedermayer2014-02-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'c0c45188e56cfa3050bb39f8299025345b8a204c'Michael Niedermayer2014-02-08
|\| | | | | | | | | | | | | * commit 'c0c45188e56cfa3050bb39f8299025345b8a204c': mlp: improve request_channel_layout behavior. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlp: improve request_channel_layout behavior.Tim Walker2014-02-08
| | | | | | | | | | | | | | | | | | | | 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.
* | Merge commit '4b7f1a7ced0e98f2cc698d896f7ebab8d30eaa09'Michael Niedermayer2014-01-05
|\| | | | | | | | | | | | | | | | | | | | | * 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>
| * mlp: Parse TrueHD decoder channel modifiers and set the AVMatrixEncoding for ↵Tim Walker2014-01-05
| | | | | | | | each substream.
* | avcodec/mlp: Fix bugs in libavs warning fixesMichael Niedermayer2013-08-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'Michael Niedermayer2013-08-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7950e519bb094897f957b9a9531cc60ba46cbc91': Disable deprecation warnings for cases where a replacement is available Conflicts: libavcodec/avpacket.c libavcodec/pthread.c libavcodec/utils.c libavdevice/v4l2.c libavfilter/avfiltergraph.c libavfilter/buffersrc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Disable deprecation warnings for cases where a replacement is availableDiego Biurrun2013-08-02
| |
* | mlp: fix channel order.Michael Niedermayer2013-01-23
| | | | | | | | | | | | This fixes a regression introduced with todays merge Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'ed1b01131e662c9086b27aaaea69684d8575fbea'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | * commit 'ed1b01131e662c9086b27aaaea69684d8575fbea': mlp: implement support for AVCodecContext.request_channel_layout. Conflicts: libavcodec/mlpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlp: implement support for AVCodecContext.request_channel_layout.Tim Walker2013-01-22
| | | | | | | | | | | | Also wrap usage of AVCodecContext.request_channels in FF_API_REQUEST_CHANNELS directives. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Merge commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | * commit 'b0c7e3ffd09f68022429920da483ad7abed84aa1': mlp_parser: account for AVCodecContext.request_channels when setting the channel layout. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlp_parser: account for AVCodecContext.request_channels when setting the ↵Tim Walker2013-01-22
| | | | | | | | | | | | | | | | channel layout. Allows users to configure the output based on what's actually decoded, rather than the full native layout. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Merge commit '99ccd2ba10eac2b282c272ad9e75f082123c765a'Michael Niedermayer2013-01-23
|\| | | | | | | | | | | | | | | | | | | | | * commit '99ccd2ba10eac2b282c272ad9e75f082123c765a': mlp: store the channel layout for each substream. Conflicts: libavcodec/mlp_parser.c libavcodec/mlpdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlp: store the channel layout for each substream.Tim Walker2013-01-22
| | | | | | | | | | | | | | | | Also stop storing the channel arrangement in the header info, as it's unused outside of ff_mlp_read_major_sync. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com> CC:libav-stable@libav.org
* | Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'Michael Niedermayer2012-11-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '97bf7c03b1338a867da52c159a2afecbdedcfa88': doc: git-howto: Leave reviewers time to react before pushing patches Include libavutil/channel_layout.h instead of libavutil/audioconvert.h lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/git-howto.texi ffmpeg_filter.c libavcodec/flacdec.c libavcodec/imc.c libavcodec/mpegaudiodec.c libavcodec/utils.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffer.c libavutil/Makefile libavutil/audioconvert.h libavutil/channel_layout.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Include libavutil/channel_layout.h instead of libavutil/audioconvert.hJustin Ruggles2012-11-11
| | | | | | | | Also reorder some other #include when applicable.
* | mlp_parser: print error when ff_combine_frame() fails to add the current bufferMichael Niedermayer2012-10-19
| | | | | | | | | | Fixes part of CID602338 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mlp_parser: dont override existing channel geometry.Michael Niedermayer2012-09-25
| | | | | | | | | | | | | | This prevents race conditions And partly fixes Ticket1726 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-09-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: os_support: Choose between direct.h and io.h using a configure check os_support: Include io.h instead of direct.h on mingw32ce x86: ac3dsp: Only refer to the ac3_downmix_sse symbol if it has been declared swscale: Remove two bogus asserts ac3: move ac3_downmix() from dsputil to ac3dsp lavr/audio_mix_matrix: acknowledge the existence of LFE2. mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same Libav channel. lavu/audioconvert: add a second low frequency channel. Conflicts: doc/APIchanges libavcodec/ac3dsp.c libavcodec/ac3dsp.h libavcodec/mlp_parser.c libavutil/audioconvert.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlp_parser: avoid mapping multiple disctinct TrueHD channels to the same ↵Tim Walker2012-09-12
| | | | | | | | | | | | Libav channel. Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-07
| |
| * mlp_parser: fix the channel mask value used for the top surround channelTim Walker2012-02-25
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | mlp_parser: use av_assertMichael Niedermayer2012-06-24
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: dxva2: don't check for DXVA_PictureParameters->wDecodedPictureIndex img2: split muxer and demuxer into separate files rm: prevent infinite loops for index parsing. aac: fix infinite loop on end-of-frame with sequence of 1-bits. mov: Add more HDV and XDCAM FourCCs. lavf: don't set AVCodecContext.has_b_frames in compute_pkt_fields(). rmdec: when using INT4 deinterleaving, error out if sub_packet_h <= 1. cdxl: correctly synchronize video timestamps to audio mlpdec_parser: fix a few channel layouts. Add channel names to channel_names[] array for channels added in b2890f5 movenc: Buffer the mdat for the initial moov fragment, too flvdec: Ignore the index if the ignidx flag is set flvdec: Fix indentation movdec: Don't parse all fragments if ignidx is set movdec: Restart parsing root-level atoms at the right spot prores: use natural integer type for the codebook index mov: Add support for MPEG2 HDV 720p24 (hdv4) swscale: K&R formatting cosmetics (part I) swscale: variable declaration and placement cosmetics Conflicts: configure libavcodec/aacdec.c libavcodec/mlp_parser.c libavformat/flvdec.c libavformat/img2.c libavformat/isom.h libavformat/mov.c libavformat/movenc.c libswscale/rgb2rgb.c libswscale/rgb2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlpdec_parser: fix a few channel layouts.Tim Walker2012-02-22
| | | | | | | | Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-21
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (36 commits) adpcmenc: Use correct frame_size for Yamaha ADPCM. avcodec: add ff_samples_to_time_base() convenience function to internal.h adx parser: set duration mlp parser: set duration instead of frame_size gsm parser: set duration mpegaudio parser: set duration instead of frame_size (e)ac3 parser: set duration instead of frame_size flac parser: set duration instead of frame_size avcodec: add duration field to AVCodecParserContext avutil: add av_rescale_q_rnd() to allow different rounding pnmdec: remove useless .pix_fmts libmp3lame: support float and s32 sample formats libmp3lame: renaming, rearrangement, alignment, and comments libmp3lame: use the LAME default bit rate libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing libmp3lame: cosmetics: remove some pointless comments libmp3lame: convert some debugging code to av_dlog() libmp3lame: remove outdated comment. libmp3lame: do not set coded_frame->key_frame. libmp3lame: improve error handling in MP3lame_encode_init() ... Conflicts: doc/APIchanges libavcodec/libmp3lame.c libavcodec/pcxenc.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/sgienc.c libavcodec/utils.c libavformat/hls.c libavutil/avutil.h libswscale/x86/swscale_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlp parser: set duration instead of frame_sizeJustin Ruggles2012-02-20
| |
* | mlp_parser: Fix infinite loop with 0 bytes_left.Michael Niedermayer2011-12-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mlp: Use correct speaker locations in TrueHD channel layout.Hendrik Leppkes2011-12-10
| | | | | | | | | | | | (cherry picked from commit d7787835ad737d4f4d8b6f17e04d981632eeaa91) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-26
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: swscale: Readd #define _SVID_SOURCE Fix av_get_channel_layout_string() for positions >31 configure: Store vda lib flags in extralibs instead of ldflags Make channel layout masks unsigned dca: ARMv6 optimised decode_blockcode() nullenc: drop AVFMT_RAWPICTURE from the flags frame-mt: return consumed packet size in ff_thread_decode_frame aacdec: add more fate tests covering SBR and PS MK(BE)TAG: avoid undefined shifts Conflicts: configure libavcodec/arm/dca.h libavcodec/dca.c libavcodec/mlp_parser.c libavcodec/version.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c libavutil/audioconvert.c libavutil/avutil.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 04:06:28 +0000