summaryrefslogtreecommitdiff
path: root/libavcodec/mlpdec.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) prores: add FATE tests id3v2: reduce the scope of some non-globally-used symbols/structures id3v2: cosmetics: move some declarations before the places they are used shorten: remove the flush function. shn: do not allow seeking in the raw shn demuxer. avformat: add AVInputFormat flag AVFMT_NO_BYTE_SEEK. avformat: update AVInputFormat allowed flags avformat: don't unconditionally call ff_read_frame_flush() when trying to seek. truespeech: use sizeof() instead of hardcoded sizes truespeech: remove unneeded variable, 'consumed' truespeech: simplify truespeech_read_frame() by using get_bits() truespeech: decode directly to output buffer instead of a temp buffer truespeech: check to make sure channels == 1 truespeech: check for large enough output buffer rather than truncating output truespeech: remove unneeded zero-size packet check. mlpdec: return meaningful error codes instead of -1 mlpdec: remove unnecessary wrapper function mlpdec: only calculate output size once mlpdec: validate that the reported channel count matches the actual output channel count pcm: reduce pointer type casting ... Conflicts: libavformat/avformat.h libavformat/id3v2.c libavformat/id3v2.h libavformat/utils.c libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mlpdec: return meaningful error codes instead of -1Justin Ruggles2011-10-13
| |
| * mlpdec: remove unnecessary wrapper functionJustin Ruggles2011-10-13
| |
| * mlpdec: only calculate output size onceJustin Ruggles2011-10-13
| |
| * mlpdec: validate that the reported channel count matches the actual outputJustin Ruggles2011-10-13
| | | | | | | | channel count
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata. H.264: tweak some other x86 asm for Atom probe: Fix insane flow control. mpegts: remove invalid error check s302m: use nondeprecated audio sample format API lavc: use designated initialisers for all codecs. x86: cabac: add operand size suffixes missing from 6c32576 Conflicts: libavcodec/ac3enc_float.c libavcodec/flacenc.c libavcodec/frwu.c libavcodec/pictordec.c libavcodec/qtrleenc.c libavcodec/v210enc.c libavcodec/wmv2dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: use designated initialisers for all codecs.Anton Khirnov2011-07-29
| | | | | | | | It's more readable and less prone to breakage.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Update the url to the site website and change ffmpeg-devel to libav-develJohan Andersson2011-03-13
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * 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>
* | Do not ask for samples if a specific channel layout was requested.Carl Eugen Hoyos2011-05-23
| |
* | Map mlp surround channels to FFmpeg rear channels.Carl Eugen Hoyos2011-05-13
| | | | | | | | | | This allows more 3rd party applications to correctly read the resulting wav files.
* | Also set the MLP/TrueHD channel layout in the decoder.Carl Eugen Hoyos2011-04-19
| | | | | | | | Applications might not use the parser,
* | Fix channel order for 7.1 TrueHD samples.Carl Eugen Hoyos2011-04-14
| |
* | Fix channel order for some MLP samples.Carl Eugen Hoyos2011-04-14
| |
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-28
|/ | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit d36beb3f6902b1217beda576aa18abf7eb72b03c)
* Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini2010-11-12
| | | | | | SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix grammar errors in documentationMåns Rullgård2010-06-30
| | | | Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Comment channel_params field in struct SubStream.Nick Brereton2010-05-11
| | | | | | Patch by Nick Brereton <nick at nbrereton dot net> Originally committed as revision 23085 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Allocate channel decoding parameters for each substream. Some fileNick Brereton2010-05-11
| | | | | | | | was encountered with a channel range that overlapped the previous substreams, and the code assumed no such overlap was possible. Patch by Nick Brereton <nick at nbrereton dot net> Originally committed as revision 23084 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
* Reduce log level of "Extracting .. channel downmix" to AV_LOG_DEBUG, theReimar Döffinger2010-01-27
| | | | | | message is pointless to ordinary users and is printed once per frame. Originally committed as revision 21486 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix crash in MLP decoder due to integer overflow.Reimar Döffinger2010-01-24
| | | | | | | Probably only DoS, init_get_bits sets buffer to NULL, thus causing a NULL-dereference directly after. Originally committed as revision 21426 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove pointless CONFIG_MLP_DECODER preprocessor check.Diego Biurrun2009-12-29
| | | | | | The file is only ever compiled if the MLP decoder is enabled. Originally committed as revision 20968 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlp: Indent.Ramiro Polla2009-10-16
| | | | Originally committed as revision 20255 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlp: Only initialize VLC tables once. This caused a crash when multipleRamiro Polla2009-10-16
| | | | | | | instances of the decoder were started at different times. Bug reported by Maxim Anisiutkin. Originally committed as revision 20254 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlp: Simplify adressing of state and coeffs arrays for both filters by makingRamiro Polla2009-05-15
| | | | | | the arrays sequential. Originally committed as revision 18841 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Fix possible writing out of array bounds introduced by beingRamiro Polla2009-05-06
| | | | | | under-paranoid in r18651. Originally committed as revision 18763 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Split sync word error and MLP sync word check.Ramiro Polla2009-05-06
| | | | | | | The previous code would print the wrong error message for MLP streams with TrueHD noise type. Originally committed as revision 18762 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Fix indentation that got mangled from copy&paste.Ramiro Polla2009-05-06
| | | | Originally committed as revision 18761 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Move MLP's filter_channel() to dsputils.Ramiro Polla2009-04-30
| | | | Originally committed as revision 18721 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Simplify filtering code by using only one counter variable.Ramiro Polla2009-04-26
| | | | Originally committed as revision 18695 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Don't overallocate buffers.Ramiro Polla2009-04-21
| | | | | | | | Now that max channels and primitive matrices are properly validated, there is no need to be paranoid that random data will be overwritten. As a bonus this makes matrix_coeff 16-byte aligned between matrices. Originally committed as revision 18651 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Validate num_primitive_matrices.Ramiro Polla2009-04-21
| | | | Originally committed as revision 18650 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Validate max_channel and max_matrix_channel.Ramiro Polla2009-04-21
| | | | Originally committed as revision 18649 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Restart header sync must be 0x31ea for MLP.Ramiro Polla2009-04-21
| | | | Originally committed as revision 18648 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Read context variable to local variable to make code cleaner.Ramiro Polla2009-04-18
| | | | Originally committed as revision 18615 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: {}- and whitespace-related cosmetics.Ramiro Polla2009-04-18
| | | | Originally committed as revision 18614 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Use some context arrays with local variables in rematrix_channels().Ramiro Polla2009-04-18
| | | | Originally committed as revision 18613 to svn://svn.ffmpeg.org/ffmpeg/trunk
* truehd: Simplify rematrix_channels() as per Michael's original review.Ramiro Polla2009-04-18
| | | | Originally committed as revision 18612 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Make read_matrix_params() take unsigned int substr for consistency.Ramiro Polla2009-04-18
| | | | Originally committed as revision 18611 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Check for {matrix,filter}_changed as soon as they are incremented.Ramiro Polla2009-04-18
| | | | Originally committed as revision 18610 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename bitstream.h to get_bits.h.Stefano Sabatini2009-04-13
| | | | Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes anThilo Borgmann2009-04-07
| | | | | | | | | | | AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows passing of packet-specific flags from demuxer to decoder, such as the keyframe flag, which appears necessary to playback corePNG P-frames. Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread "Google Summer of Code participation" on the mailinglist. Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Filters and matrices may change only once per substream per access unit.Ramiro Polla2009-04-06
| | | | Originally committed as revision 18338 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: There must be no extraword for MLP.Ramiro Polla2009-04-05
| | | | Originally committed as revision 18337 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Validate non-restart bit from the substream header.Ramiro Polla2009-04-05
| | | | Originally committed as revision 18336 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: matrix_out_ch must not be greater than max_matrix_channel, and not ↵Ramiro Polla2009-04-05
| | | | | | max_channel. Originally committed as revision 18335 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mlpdec: Simplify check for substream_parity_present.Ramiro Polla2009-03-30
| | | | Originally committed as revision 18240 to svn://svn.ffmpeg.org/ffmpeg/trunk