summaryrefslogtreecommitdiffstats
path: root/libavcodec/binkaudio.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * binkaudio: store interleaved overlap samples in BinkAudioContext.Justin Ruggles2011-10-291-4/+12
| | | | | | | | | | This fixes the requirement for the buffer size to be larger than the number of samples actually decoded.
| * binkaudio: pre-calculate quantization factorsJustin Ruggles2011-10-291-2/+7
| |
| * binkaudio: add some buffer overread checks.Justin Ruggles2011-10-291-10/+37
| | | | | | | | This stops decoding before overreads instead of after.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-301-16/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-16/+14
| | | | | | | | It's more readable and less prone to breakage.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-07-061-2/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffserver: remove unused variable. Remove unused and outdated TODO file. gitignore: Drop individual .d ignore; it is already covered by a wildcard. lavf: deprecate AVStream.quality. bink: pass Bink version to audio decoder through extradata instead of codec_tag. libpostproc: Remove disabled code. flashsv: improve some comments and fix some wrong ones flashsv: Eliminate redundant variable indirection. flashsv: set reference frame type to full frame flashsv: replace bitstream description by a link to the specification flashsv: convert a debug av_log into av_dlog flashsv: simplify condition flashsv: return more meaningful error values flashsv: cosmetics: break some overly long lines flashsv: cosmetics: drop some unnecessary parentheses swscale: amend documentation to mention use of native depth for scaling. eval: add missing comma to tests. eval: fix memleak. H.264: make loopfilter bS const where applicable Conflicts: libavcodec/binkaudio.c libavformat/bink.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * bink: pass Bink version to audio decoder through extradata instead of codec_tag.Kostya2011-07-061-1/+1
| | | | | | | | | | | | | | This is needed because not all players (e.g. MPlayer) are able to distinguish two different Bink audio decoders when codec_tag is set. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Fix bink audio playback outside of FFmpeg.Ivan Kalvachev2011-06-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are 2 known Bink audio codecs. Additionally they have a different flavor if they are found inside Bink-b "BIKb" file. In order to guess the correct flavor, the demuxer sets the audio codec_tag to be the same as the file format tag. This causes problem because same tag is used for both audio codecs. The hack works in FFmpeg because audio codecs are identified by their codec_id, but other players rely on standard behavior. This fix removes the codec_tag hack and instead uses artificial extradata format to signal the codec flavor. This would also allow proper embedding of Bink audio in other containers. Signed-off-by: Ivan Kalvachev <ikalvachev@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (23 commits) ac3enc: correct the flipped sign in the ac3_fixed encoder Eliminate pointless '#if 1' statements without matching '#else'. Add AVX FFT implementation. Increase alignment of av_malloc() as needed by AVX ASM. Update x86inc.asm from x264 to allow AVX emulation using SSE and MMX. mjpeg: Detect overreads in mjpeg_decode_scan() and error out. documentation: extend documentation for ffmpeg -aspect option APIChanges: update commit hashes for recent additions. lavc: deprecate FF_*_TYPE macros in favor of AV_PICTURE_TYPE_* enums aac: add headers needed for log2f() lavc: remove FF_API_MB_Q cruft lavc: remove FF_API_RATE_EMU cruft lavc: remove FF_API_HURRY_UP cruft pad: make the filter parametric vsrc_movie: add key_frame and pict_type. vsrc_movie: fix leak in request_frame() lavfi: add key_frame and pict_type to AVFilterBufferRefVideo. vsrc_buffer: add sample_aspect_ratio fields to arguments. lavfi: add fieldorder filter scale: make the filter parametric ... Conflicts: Changelog doc/filters.texi ffmpeg.c libavcodec/ac3dec.h libavcodec/dsputil.c libavfilter/avfilter.h libavfilter/vf_scale.c libavfilter/vf_yadif.c libavfilter/vsrc_buffer.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add AVX FFT implementation.Vitor Sessak2011-04-261-1/+1
| | | | | | | | Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-211-3/+4
|\ \ | |/ | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move dct and rdft definitions to separate filesMans Rullgard2011-03-201-1/+2
| | | | | | | | | | | | | | This leaves fft.h with only the core FFT and MDCT definitions thus making it more managable. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * fft: remove inline wrappers for function pointersMans Rullgard2011-03-191-2/+2
| | | | | | | | | | | | | | This removes the rather pointless wrappers (one not even inline) for calling the fft_calc and related function pointers. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Bink version 'b' audio decoderPeter Ross2011-02-251-5/+17
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * binkaudio: simplify frame_len_bits and frame_len calculationPeter Ross2011-02-251-4/+2
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * binkaudio: remove unnecessary loopPeter Ross2011-02-251-5/+2
| | | | | | | | | | | | | | decode_init sets bands[0] == 2, so this loop always sets the band table index (k) to zero. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * binkaudio: perform band table scaling in decode_initPeter Ross2011-02-251-5/+5
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * binkaudio: remove unused copy of AVCodecContext*Peter Ross2011-02-151-3/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * binkaudio: fix channel count checkPeter Ross2011-02-151-2/+2
| | | | | | | | | | | | | | | | | | Perform validity check on AVFormatContext.channels instead of uninitialised field. This fixes issue 2001. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Separate format conversion DSP functions from DSPContext.Justin Ruggles2011-02-021-1/+5
| | | | | | | | | | | | | | This will be beneficial for use with the audio conversion API without requiring it to depend on all of dsputil. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Remove the add bias hack for the C version of DSPContext.float_to_int16_*().Justin Ruggles2011-01-281-5/+0
| |
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-261-2/+2
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Bink version 'b' audio decoderPeter Ross2011-02-261-5/+17
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit ccfcddb3f287545a20831f266c2a2f734d6a9f31)
* | binkaudio: simplify frame_len_bits and frame_len calculationPeter Ross2011-02-261-4/+2
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 8a8c283edd0da5863eb729a31a94b70820400941)
* | binkaudio: remove unnecessary loopPeter Ross2011-02-261-5/+2
| | | | | | | | | | | | | | | | decode_init sets bands[0] == 2, so this loop always sets the band table index (k) to zero. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit a304def1dca50d63bf2a39651f84792980db3508)
* | binkaudio: perform band table scaling in decode_initPeter Ross2011-02-261-5/+5
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit 582ac86d19c61ad73c2e1a2d5ed54a5fe1e20bd1)
* | binkaudio: remove unused copy of AVCodecContext*Peter Ross2011-02-151-3/+1
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 71f88b1f3843fdb676d6f72181da0c8c460341d8)
* | binkaudio: fix channel count checkPeter Ross2011-02-151-2/+2
| | | | | | | | | | | | | | | | | | | | Perform validity check on AVFormatContext.channels instead of uninitialised field. This fixes issue 2001. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 9806fbd5351fa84f99fa5b18fe06859acb514f34)
* | Separate format conversion DSP functions from DSPContext.Justin Ruggles2011-02-041-1/+5
| | | | | | | | | | | | | | | | This will be beneficial for use with the audio conversion API without requiring it to depend on all of dsputil. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit c73d99e672329c8f2df290736ffc474c360ac4ae)
* | Remove the add bias hack for the C version of DSPContext.float_to_int16_*().Justin Ruggles2011-01-281-5/+0
| | | | | | | | (cherry picked from commit 9d06d7bce3babb82ed650c13ed13a57f6f626a71)
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-281-2/+2
|/ | | | | | | | 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-121-1/+1
| | | | | | 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
* Make code using 1d-DCT consistent with the API changeVitor Sessak2010-04-031-1/+1
| | | | Originally committed as revision 22792 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-301-2/+2
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make binkaudio work with ff_float_to_int16_interleave_c (martin at martin ↵Peter Ross2010-03-111-0/+5
| | | | | | dot st) Originally committed as revision 22466 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Give RDFT types more meaningful namesMåns Rullgård2010-03-071-1/+1
| | | | Originally committed as revision 22290 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move FFT parts from dsputil.h to fft.hMåns Rullgård2010-03-061-0/+2
| | | | Originally committed as revision 22235 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove DECLARE_ALIGNED_{8,16} macrosMåns Rullgård2010-03-061-2/+2
| | | | | | | These macros are redundant. All uses are replaced with the generic DECLARE_ALIGNED macro instead. Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Perform coefficient transformations in Bink Audio DCT decoder (issue1770)Peter Ross2010-03-031-2/+5
| | | | Originally committed as revision 22167 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use reported_size to truncate final Bink Audio framePeter Ross2010-02-231-5/+1
| | | | Originally committed as revision 21993 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix compilation of binkaudio_rdft when dct is disabledDaniel Verkamp2010-02-191-6/+8
| | | | Originally committed as revision 21903 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update binkaudio to new DECLARE_ALIGNED syntaxDaniel Verkamp2010-01-311-2/+2
| | | | Originally committed as revision 21573 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Bink Audio decoderPeter Ross2010-01-311-0/+303
Originally committed as revision 21570 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud