summaryrefslogtreecommitdiffstats
path: root/libavcodec/dca.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-211-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). x86: cabac: fix register constraints for 32-bit mode cabac: move x86 asm to libavcodec/x86/cabac.h x86: h264: cast pointers to intptr_t rather than int x86: h264: remove hardcoded edi in decode_significance_8x8_x86() x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86() x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86() x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86() x86: cabac: change 'a' constraint to 'r' in get_cabac_inline() x86: cabac: remove hardcoded esi in get_cabac_inline() x86: cabac: remove hardcoded edx in get_cabac_inline() x86: cabac: remove unused macro parameter x86: cabac: remove hardcoded ebx in inline asm x86: cabac: remove hardcoded struct offsets from inline asm cabac: remove inline asm under #if 0 cabac: remove BRANCHLESS_CABAC_DECODER switch cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED document libswscale bump error_resilience: skip last-MV predictor step if MVs are not available. error_resilience: actually add counter when adding a MV predictor. ... Conflicts: Changelog libavcodec/error_resilience.c libavfilter/defaults.c libavfilter/vf_drawtext.c libswscale/swscale.h tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().Justin Ruggles2011-06-201-1/+1
| | | | | | | | av_get_bits_per_sample_fmt() is deprecated.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-031-4/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) Replace custom DEBUG preprocessor trickery by the standard one. vorbis: Remove non-compiling debug statement. vorbis: Remove pointless DEBUG #ifdef around debug output macros. cook: Remove non-compiling debug output. Remove pointless #ifdefs around function declarations in a header. Replace #ifdef + av_log() combinations by av_dlog(). Replace custom debug output functions by av_dlog(). cook: Remove unused debug functions. Remove stray extra arguments from av_dlog() invocations. targa: fix big-endian build v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. vfwcap: add a framerate private option. v4l2: add a framerate private option. libdc1394: add a framerate private option. fbdev: add a framerate private option. bktr: add a framerate private option. oma: check avio_read() return value nutdec: remove unused variable Remove unused variables swscale: allocate larger buffer to handle altivec overreads. ... Conflicts: ffmpeg.c libavcodec/dca.c libavcodec/dirac.c libavcodec/error_resilience.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pthread.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/shorten.c libavcodec/truemotion2.c libavcodec/utils.c libavdevice/dv1394.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/4xm.c libavformat/apetag.c libavformat/asfdec.c libavformat/avidec.c libavformat/mmf.c libavformat/mpeg.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/oggdec.c libavformat/oggparseogm.c libavformat/rl2.c libavformat/rmdec.c libavformat/rpl.c libavformat/rtpdec_latm.c libavformat/sauce.c libavformat/sol.c libswscale/utils.c tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unused variablesMans Rullgard2011-06-021-4/+2
| |
* | Fix various unused variable warningsClément Bœsch2011-05-301-3/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-191-13/+23
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: APIchanges: fill in date and commit for request_sample_fmt Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders. Add support for request_sample_format in ffmpeg and ffplay. Add APIchanges entry for request_sample_fmt. Add request_sample_fmt field to AVCodecContext. Add float_interleave() to FmtConvertContext with x86-optimized versions. Remove unused make variable SEEK_REFFILE fate: remove redundant aref and vref references fate: remove do_ffmpeg_nocheck function fate: do not collect -benchmark output mpegaudiodec: remove decode_end() function fate: run aref and vref as regular tests mpegaudio: sanitise compute_antialias_* names mpeg12: add slice-threading checks to slice-threading initializers. h264: copy pixel_shift between slice threading contexts. mdec: enable frame-level multithreading. mdec.c: fix overread. Conflicts: libavcodec/aacdec.c libavcodec/ac3dec.c libavcodec/avcodec.h libavcodec/dca.c libavcodec/h264.c libavcodec/mdec.c libavcodec/mpeg12.c libavcodec/options.c libavcodec/version.h libavcodec/vorbisdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbisJustin Ruggles2011-05-181-7/+27
| | | | | | | | | | | | decoders. Based on patches by clsid2 in ffdshow-tryout.
* | Support native DTS channel order when requested.Alexandre Colucci2011-05-131-0/+4
| |
* | Fix data_size handling for AC3 and dca decoders.Reimar Döffinger2011-05-011-3/+5
| | | | | | | | | | | | They use now code identical to the AAC decoder. The AC3 decoder previously did not check the data_size and the dca decoder checked against and set wrong values for float.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-271-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-5/+5
| | | | | | | | Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| * Replace more FFmpeg instances by Libav or ffmpeg.Diego Biurrun2011-04-231-1/+1
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dca: use EXT_AUDIO_ID field to determine core extensionsAnssi Hannula2011-02-241-20/+49
| | | | | | | | | | | | | | | | | | This avoids the core substream extensions scan when the EXT_AUDIO_ID field indicates no extensions or only unsupported extensions. The scan is done only if the value of EXT_AUDIO_ID is unknown or indicates a present XCh extension which we can decode. 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-2/+2
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Separate format conversion DSP functions from DSPContext.Justin Ruggles2011-02-021-2/+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>
| * dca: avoid C99 declaration in for() expressionGianluigi Tiesi2011-02-011-1/+3
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Remove unneeded add bias from 3 functions.Justin Ruggles2011-01-311-2/+2
| | | | | | | | | | | | | | | | DSPContext.vector_fmul_window() DCADSPContext.lfe_fir() SynthFilterContext.synth_filter_float() Signed-off-by: Mans Rullgard <mans@mansr.com>
| * cosmetics: indentation and spacingJustin Ruggles2011-01-281-7/+6
| |
| * Remove the add bias hack for the C version of DSPContext.float_to_int16_*().Justin Ruggles2011-01-281-28/+19
| |
| * 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>
| * dca: add profile namesAnssi Hannula2011-01-211-0/+10
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * dca: consider a stream with XXCh/X96 in ExSS as DTS-HD HRAAnssi Hannula2011-01-211-5/+2
| | | | | | | | | | | | | | | | | | | | | | DTS-HD HRA streams do not always have an XBR extension in the extension substream. Instead they can have only XXCh and X96 extensions in there and still be considered DTS-HD HRA. This is also confirmed with Onkyo TX-SR607 receiver which recognizes such a stream as HiRes Audio. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | dca: allow selecting float output at runtime.Reimar Döffinger2011-04-251-18/+10
| |
* | Libavcodec AC3/E-AC3/DTS decoders now output floating point data.clsid22011-04-031-2/+19
| | | | | | | | git-svn-id: https://ffdshow-tryout.svn.sourceforge.net/svnroot/ffdshow-tryout@3769 3b938f2f-1a1a-0410-8054-a526ea5ff92c
* | dca: use EXT_AUDIO_ID field to determine core extensionsAnssi Hannula2011-02-261-20/+49
| | | | | | | | | | | | | | | | | | | | This avoids the core substream extensions scan when the EXT_AUDIO_ID field indicates no extensions or only unsupported extensions. The scan is done only if the value of EXT_AUDIO_ID is unknown or indicates a present XCh extension which we can decode. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 7e06e0ede3b798f591634b277e8dfa6507b196de)
* | 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-2/+2
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit c2fcd0a7a4d0bda1a3306e40b70ce281a987df60)
* | Separate format conversion DSP functions from DSPContext.Justin Ruggles2011-02-041-2/+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)
* | dca: avoid C99 declaration in for() expressionGianluigi Tiesi2011-02-021-1/+3
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit e86e858111501650bb9ce8e39282e20c57bac913)
* | Remove unneeded add bias from 3 functions.Justin Ruggles2011-02-021-2/+2
| | | | | | | | | | | | | | | | | | DSPContext.vector_fmul_window() DCADSPContext.lfe_fir() SynthFilterContext.synth_filter_float() Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 80ba1ddb58b5923b9f36a6acd542affc4ca722eb)
* | cosmetics: indentation and spacingJustin Ruggles2011-01-281-7/+6
| | | | | | | | (cherry picked from commit b5ec6383432c907bed175f20e39af1a99dc75cfb)
* | Remove the add bias hack for the C version of DSPContext.float_to_int16_*().Justin Ruggles2011-01-281-28/+19
| | | | | | | | (cherry picked from commit 9d06d7bce3babb82ed650c13ed13a57f6f626a71)
* | 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)
* | dca: add profile namesAnssi Hannula2011-01-231-0/+10
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit f4096bf6eeddc605457192476dbbf110d4cc6140)
* | dca: consider a stream with XXCh/X96 in ExSS as DTS-HD HRAAnssi Hannula2011-01-231-5/+2
|/ | | | | | | | | | | | DTS-HD HRA streams do not always have an XBR extension in the extension substream. Instead they can have only XXCh and X96 extensions in there and still be considered DTS-HD HRA. This is also confirmed with Onkyo TX-SR607 receiver which recognizes such a stream as HiRes Audio. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 8f4a5d225c6cd65c5f306a200da991f8a59a439a)
* cosmetics: reindentJustin Ruggles2011-01-181-1/+1
|
* Add check for changing number of channels in DCA.Daniel Kang2011-01-181-0/+9
| | | | Fixes issue 2505.
* Fix reading over the end of the allocated buffer.Anssi Hannula2011-01-091-1/+15
| | | | | | Patch by Anssi Hannula, anssi d hannula a iki d fi Originally committed as revision 26291 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Export dca profile information.Anssi Hannula2011-01-061-3/+351
| | | | | | Patch by Anssi Hannula anssi d hannula a iki d fi Originally committed as revision 26250 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Verify FSIZE96 when encountering X96 sync code.Anssi Hannula2011-01-061-3/+9
| | | | | | Patch by Anssi Hannula, anssi d hannula a iki d fi Originally committed as revision 26249 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use the new libavcore audio channel API.Stefano Sabatini2010-11-211-20/+21
| | | | | | | This also allows to remove a linking dependency of libavfilter on libavcodec. Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 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
* Add the CODEC_CAP_CHANNEL_CONF capability code and addBenjamin Larsson2010-10-021-0/+1
| | | | | | | | | that flag to the dca codec. This capability when set will make sure the codec will initialize the channel configuration instead of trusting the container. This fixes issue 2137 and issue 850. Originally committed as revision 25320 to svn://svn.ffmpeg.org/ffmpeg/trunk
* dca: fix dynrange coefficient in xchNick Brereton2010-07-311-1/+1
| | | | | | Patch by Nick Brereton Originally committed as revision 24637 to svn://svn.ffmpeg.org/ffmpeg/trunk
* DCA: fix multichannel -> 2 channel downmix.Nick Brereton2010-07-271-14/+33
| | | | | | Patch by Nick Brereton Originally committed as revision 24555 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Setup correct channel value when downmixing is required.Nick Brereton2010-07-271-5/+6
| | | | | | Patch by Nick Brereton Originally committed as revision 24554 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use math constant instead of hardcoded rounded value for sqrt(0.5).Christophe Gisquet2010-07-121-2/+2
| | | | | | Patch by Christophe.Gisquet (gmail) Originally committed as revision 24213 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix side channels when XCh extension is present.Nick Brereton2010-07-121-0/+14
| | | | | | Patch by Nick Brereton $name AT n$surname DOT net Originally committed as revision 24210 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud