summaryrefslogtreecommitdiffstats
path: root/libavcodec/wavpack.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-241-3/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Move id3v2 tag writing to a separate file. swscale: add missing colons to x86 assembly yuv2planeX. g722: split decoder and encoder into separate files cosmetics: remove extra spaces before end-of-statement semi-colons vorbisdec: check output buffer size before writing output wavpack: calculate bpp using av_get_bytes_per_sample() ac3enc: Set max value for mode options correctly lavc: move get_b_cbp() from h263.h to mpeg4videoenc.c mpeg12: move closed_gop from MpegEncContext to Mpeg1Context mpeg12: move full_pel from MpegEncContext to Mpeg1Context mpeg12: move Mpeg1Context from mpeg12.c to mpeg12.h mpegvideo: remove some unused variables from MpegEncContext. Conflicts: libavcodec/mpeg12.c libavformat/mp3enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wavpack: calculate bpp using av_get_bytes_per_sample()Justin Ruggles2011-10-231-3/+1
| |
| * wavpack: Reset internal state on corrupted blocksLaurent Aimar2011-10-071-10/+13
| | | | | | | | | | | | | | | | wavpack_decode_block() supposes that it is called back with the exact same buffer unless it has returned with an error. With multi-channels files, wavpack_decode_frame() was breaking this assumption. Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | Reset internal state on corrupted blocks in wavpack decoder.Laurent Aimar2011-09-271-10/+13
| | | | | | | | | | | | | | | | wavpack_decode_block() supposes that it is called back with the exact same buffer unless it has returned with an error. With multi-channels files, wavpack_decode_frame() was breaking this assumption. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-101-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks. avconv: move audio_channels to the options context. avconv: move *_disable to options context. avconv: remove -[vas]lang options. avconv: move codec tags to options context. cljr: init_get_bits size in bits instead of bytes indeo2: fail if input buffer too small indeo2: init_get_bits size in bits instead of bytes ffv1: Fixed size given to init_get_bits() in decoder. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fixed segfault with wavpack decoder on corrupted decorrelation terms sub-blocks.Laurent Aimar2011-09-101-2/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-091-3/+10
|\ \ | |/ | | | | | | | | | | * qatar/master: wavpack: Check error codes rather than working around error conditions. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wavpack: Check error codes rather than working around error conditions.Alex Converse2011-09-081-3/+10
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-081-18/+39
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Employ FF_ARRAY_ELEMS instead of manually calculating array length. Fixed invalid access in wavpack decoder on corrupted bitstream. Fixed invalid writes in wavpack decoder on corrupted bitstreams. Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks. rtpdec_asf: Fix integer underflow that could allow remote code execution Conflicts: libavformat/rtpdec_asf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fixed invalid access in wavpack decoder on corrupted bitstream.Laurent Aimar2011-09-081-14/+35
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * Fixed invalid writes in wavpack decoder on corrupted bitstreams.Laurent Aimar2011-09-081-3/+3
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.Laurent Aimar2011-09-081-1/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-051-4/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3enc: Add channel coupling support for the fixed-point AC-3 encoder. ac3enc: scale floating-point coupling channel coefficients in scale_coefficients() rather than in apply_channel_coupling() ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled. wavpack: fix wrong return value in wavpack_decode_block() avconv: fix parsing metadata specifiers. fate: use +frame+slice named constants instead of '3' mpeg12: propagate more real return values through chunk decode error return and fix some indentation wavpack: use context reset in appropriate places avconv: move mux_preload and mux_max_delay to options context avconv: move bitstream filters to options context. avconv: move rate_emu to options context. avconv: move max_frames to options context. avconv: move metadata to options context. avconv: move ts scale to options context. avconv: move chapter maps to options context. avconv: move metadata maps to options context. avconv: move codec_names to options context. Conflicts: avconv.c tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wavpack: fix wrong return value in wavpack_decode_block()Kostya Shishkov2011-09-051-1/+1
| | | | | | | | | | | | | | | | This function should return number of samples decoded, not number of bytes decoded. Spotted by Uoti Urpala. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * wavpack: use context reset in appropriate placesKostya Shishkov2011-09-051-3/+4
| | | | | | | | | | | | | | | | This fixes improper flushing in the cases when the same frame is decoded in several iterations (for being too large to fit into output buffer) and flush is called mid-decoding and it also resets context in case of decoding errors. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-211-0/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * qatar/master: WavPack demuxer: do not rely on index when timestamp is not in indexed range. WavPack demuxer: store position of the first block in index. WavPack decoder: implement flush function avconv: Separate initialization from the main transcode loop. Conflicts: avconv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * WavPack decoder: implement flush functionKostya Shishkov2011-08-211-0/+10
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-301-8/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-291-8/+7
| | | | | | | | It's more readable and less prone to breakage.
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * Replace remaining occurrences of deprecated CH_* with AV_CH_*Anton Khirnov2011-02-061-1/+2
| | | | | | | | 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-261-1/+1
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * reindent after last commitKostya2011-01-241-6/+6
| | | | | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
| * Extend WavPack demuxer and decoder to support >2 channel audioKostya2011-01-241-50/+216
| | | | | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* | Merge libavcore into libavutilReinhard Tartler2011-02-161-1/+1
| | | | | | | | Done to keep ABI compatible. Otherwise this is just silly
* | Replace remaining occurrences of deprecated CH_* with AV_CH_*Anton Khirnov2011-02-061-1/+2
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit c2fcd0a7a4d0bda1a3306e40b70ce281a987df60)
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-281-1/+1
| | | | | | | | | | | | | | | | 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)
* | reindent after last commitKostya2011-01-261-6/+6
| | | | | | | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit dacbcd170a329dda2014159ca9fc9d11d887625c)
* | Extend WavPack demuxer and decoder to support >2 channel audioKostya2011-01-261-50/+216
|/ | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 3bdc886c22710d3207b1bd75f8d2d65ec77cace5)
* Limit number of samples decoded for WavPack mono mode, so decoded samples willKostya Shishkov2011-01-081-1/+1
| | | | | | fit into output buffer. Originally committed as revision 26269 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fail more gracefully for multichannel wavpack in another container.Carl Eugen Hoyos2011-01-071-0/+4
| | | | Originally committed as revision 26253 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini2010-11-121-29/+29
| | | | | | SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | 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-301-1/+1
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: reindent after last commitKostya Shishkov2010-02-191-61/+61
| | | | Originally committed as revision 21895 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Since WavPack chunk can contain more samples than FFmpeg is guaranteed toKostya Shishkov2010-02-191-12/+75
| | | | | | hold, decode it in several iterations outputting as many samples as possible. Originally committed as revision 21894 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use get_bits_left() instead of size_in_bits - get_bits_count().Ronald S. Bultje2009-11-161-2/+2
| | | | Originally committed as revision 20543 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add CODEC_CAP_SUBFRAMES for codecs that output multiple subframesSascha Sommer2009-09-161-0/+1
| | | | | | | | per AVPacket No longer print "Multiple frames in a packet" error message when CODEC_CAP_SUBFRAMES is set (wmapro, wavpack) Originally committed as revision 19881 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add floating point audio decoding to WavPack decoder.Laurent Aimar2009-05-061-8/+131
| | | | | | Patch by Laurent Aimar (fenrir at `antonym of 'audio'+antonym of 'WAN'` dot org) Originally committed as revision 18754 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Prepare WavPack decoder to support floating point output.Laurent Aimar2009-05-061-17/+17
| | | | | | Patch by Laurent Aimar (f-e-n-r-i-r .@.t. v=i=d=e=o=l=a=n .d.o.t. o=r=g) Originally committed as revision 18753 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize out integer sample value decoding for WavPack.Laurent Aimar2009-05-051-33/+26
| | | | | | This is slightly modified patch by Laurent Aimar. Originally committed as revision 18740 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Check whether extra bits block has enough data.Laurent Aimar2009-05-031-0/+8
| | | | | | Patch by Laurent Aimar "f\145nr\151r >at< vide\157lan <dot> o\162g" Originally committed as revision 18732 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove dead assignments found by CSABenjamin Larsson2009-05-021-1/+0
| | | | Originally committed as revision 18730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Decode extended bitstream for high-precision WavPack files.Laurent Aimar2009-05-021-2/+50
| | | | | | Patch by Laurent Aimar [(wolf, son of Loki) <at> (videolan) <dot> (org)] Originally committed as revision 18729 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correctly update output sample format in wavpack decoder.Laurent Aimar2009-04-261-6/+15
| | | | | | Patch by Laurent Aimar (at 'fenrir (cons 'videolan 'org)) Originally committed as revision 18694 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Merge decoding functions for all bitdepths in WavPack decoderKostya Shishkov2009-04-241-146/+52
| | | | Originally committed as revision 18675 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Handle WavPack INT32INFO chunks with nonzero post shiftKostya Shishkov2009-04-231-2/+4
| | | | Originally committed as revision 18668 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add functions for decoding >16 bits WavPack files.Kostya Shishkov2009-04-231-9/+155
| | | | | | Based on patches by Laurent Aimar (fenrir >whirlpool< videolan >dit< org) Originally committed as revision 18667 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Shift 9-15 bit samples to use full 16-bit range.Laurent Aimar2009-04-231-3/+5
| | | | | | | Patch by Laurent Aimar <fenrir at VLCsite> Thread: [PATCH] Fixed wavpack 9-15 bits support Originally committed as revision 18666 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud