summaryrefslogtreecommitdiffstats
path: root/libavcodec/aac.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qatar/master'Michael Niedermayer2011-05-161-1/+1
|\ | | | | | | | | | | | | | | | | | | | | * qatar/master: aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding. acelp: Remove unused gray_decode table. dfa: Remove unused variable. configure: Include AVX availability in summary output. configure: use same CPPFLAGS in kFreeBSD as Linux Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: Use float instead of int16_t for ltp_state to avoid needless rounding.Justin Ruggles2011-05-151-1/+1
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-281-2/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vorbisdec: Rename silly "class_" variable to plain "class". simple_idct_alpha: Drop some useless casts. Simplify av_log_missing_feature(). ac3enc: remove check for mismatching channels and channel_layout If AVCodecContext.channels is 0 and AVCodecContext.channel_layout is non-zero, set channels based on channel_layout. If AVCodecContext.channel_layout and AVCodecContext.channels are both non-zero, check to make sure they do not contradict eachother. cosmetics: indentation Check AVCodec.supported_samplerates and AVCodec.channel_layouts in avcodec_open(). aacdec: remove sf_scale and sf_offset. aacdec: use a scale of 2 in the LTP MDCT rather than doubling the coefficient table values from the spec. Define POW_SF2_ZERO in aac.h and use for ff_aac_pow2sf_tabp[] offsets instead of hardcoding 200 everywhere. Large intensity stereo and PNS indices are legal. Clip them instead of erroring out. A magnitude of 100 corresponds to 2^25 so the will most likely result in clipped output anyway. qpeg: use reget_buffer() in decode_frame() ultimotion: use reget_buffer() in ulti_decode_frame() smacker: remove unnecessary call to avctx->release_buffer in decode_frame() avparser: don't av_malloc(0). Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: remove sf_scale and sf_offset.Alex Converse2011-04-271-2/+0
| | | | | | | | | | | | | | Instead, scalefactors are adjusted by the offset amount, removing the need for sf_scale, and the MDCT scales are adjusted to compensate for the higher scalefactors. Floating-point output will be handled by modifying the MDCT scales.
| * Define POW_SF2_ZERO in aac.h and use for ff_aac_pow2sf_tabp[] offsets insteadAlex Converse2011-04-271-0/+1
| | | | | | | | of hardcoding 200 everywhere.
* | 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 FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * aacdec: Reduce the size of buf_mdct.Young Han Lee2011-02-211-1/+1
| | | | | | | | | | It was doubled in size for the LTP implementation. This brings it back down to its original size.
| * aacdec: Implement LTP support.Young Han Lee2011-02-141-9/+23
| | | | | | | | Ported from gsoc svn.
| * Separate format conversion DSP functions from DSPContext.Justin Ruggles2011-02-021-0/+2
| | | | | | | | | | | | | | 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-1/+0
| |
* | aacdec: Reduce the size of buf_mdct.Young Han Lee2011-02-221-1/+1
| | | | | | | | | | | | It was doubled in size for the LTP implementation. This brings it back down to its original size. (cherry picked from commit e22910b21a6c78b0159f98426b10c204f12bc15a)
* | aacdec: Implement LTP support.Young Han Lee2011-02-151-9/+23
| | | | | | | | | | Ported from gsoc svn. (cherry picked from commit ead15f1dc196ad164d105e31c8c9025f8a4ee4e7)
* | Separate format conversion DSP functions from DSPContext.Justin Ruggles2011-02-041-0/+2
| | | | | | | | | | | | | | | | 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-1/+0
|/ | | | (cherry picked from commit 9d06d7bce3babb82ed650c13ed13a57f6f626a71)
* aacdec: Rework channel mapping compatibility hacks.Alex Converse2010-09-101-1/+0
| | | | | | | | | | For a PCE based configuration map the channels solely based on tags. For an indexed configuration map the channels solely based on position. This works with all known exotic samples including al17, elem_id0, bad_concat, and lfe_is_sce. Originally committed as revision 25098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Whitespace cosmeticsAlex Converse2010-06-051-3/+3
| | | | Originally committed as revision 23491 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aac: Move an initialization macro used only by the decoder out of the header.Alex Converse2010-06-051-6/+0
| | | | Originally committed as revision 23490 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacdec: Rename avccontext to avctx.Alex Converse2010-06-051-1/+1
| | | | Originally committed as revision 23488 to svn://svn.ffmpeg.org/ffmpeg/trunk
* aacdec: Work around illegal files with all elem_id tags set to the same value.Alex Converse2010-06-031-0/+1
| | | | | | Fixes issue 1882. Originally committed as revision 23439 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
* Add an HE-AAC v1 decoder.Alex Converse2010-03-081-1/+3
| | | | | | | | | A large portion of this code was orignally authored by Robert Swain. The rest was written by me. Full history is available at: svn://svn.ffmpeg.org/soc/aac-sbr http://github.com/aconverse/ffmpeg-heaac/tree/sbr_pub Originally committed as revision 22316 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move FFT parts from dsputil.h to fft.hMåns Rullgård2010-03-061-0/+1
| | | | Originally committed as revision 22235 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove DECLARE_ALIGNED_{8,16} macrosMåns Rullgård2010-03-061-4/+4
| | | | | | | 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
* Move array specifiers outside DECLARE_ALIGNED() invocationsMåns Rullgård2010-01-221-5/+5
| | | | Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
* AAC: Reduce depth of vlc_spectral tables to 2Måns Rullgård2010-01-131-1/+1
| | | | | | Up to 6% faster overall on i7, no change on A8. Originally committed as revision 21191 to svn://svn.ffmpeg.org/ffmpeg/trunk
* AAC: Add a global header but output not locked output configuration status.Alex Converse2009-12-021-0/+1
| | | | Originally committed as revision 20701 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Don't lock the channel output configuration based on the first value seen forAlex Converse2009-11-031-1/+11
| | | | | | | non extradata formats. Instead lock it only after the successful decoding of a frame. This fixes issue 999. Originally committed as revision 20448 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Merge FFTContext and MDCTContextMåns Rullgård2009-09-201-2/+2
| | | | Originally committed as revision 19931 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Ignore subsequent channel configurations after the first in an AAC file. TheAlex Converse2009-07-101-0/+2
| | | | | | | current code doesn't handle them properly, and they are a dubious construction at best. Originally committed as revision 19399 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Merge the AAC encoder from SoC svn. It is still considered experimental.Alex Converse2009-07-081-3/+16
| | | | Originally committed as revision 19375 to svn://svn.ffmpeg.org/ffmpeg/trunk
* The internal header libavutil/internal.h should not be used outside libavutil.Diego Biurrun2009-06-111-1/+0
| | | | Originally committed as revision 19157 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move MPEG-4 AOT enum to mpeg4audio.h.Alex Converse2009-03-181-30/+0
| | | | Originally committed as revision 18031 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix the channel allocation bug/assumption (issue 800).Alex Converse2009-03-061-0/+2
| | | | | | Approved by Rob on IRC. Originally committed as revision 17856 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add missing #includes to fix 'make checkheaders'.Diego Biurrun2009-02-171-0/+1
| | | | Originally committed as revision 17398 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Doxygen defgroups throw a warning if they don't have a title as well as a nameRobert Swain2009-02-021-1/+1
| | | | Originally committed as revision 16939 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-011-1/+1
| | | | | | | Otherwise doxygen complains about ambiguous filenames when files exist under the same name in different subdirectories. Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
* AAC: Fix AAC prediction when used in conjunction with the CPEAlex Converse2008-12-211-1/+1
| | | | | | Patch by Alex Converse (alex converse gmail com) Originally committed as revision 16250 to svn://svn.ffmpeg.org/ffmpeg/trunk
* AAC: move scratch array to context to ensure 16-byte alignmentMåns Rullgård2008-12-101-0/+1
| | | | Originally committed as revision 16043 to svn://svn.ffmpeg.org/ffmpeg/trunk
* AAC: Frequency domain prediction and hence Main profile supportAlex Converse2008-11-241-0/+19
| | | | | | Patch by Alex Converse ( alex converse gmail com ) Originally committed as revision 15919 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix perceptual noise shaping scaling including an oversight of the offset forAlex Converse2008-11-051-1/+0
| | | | | | | | the EIGHT_SHORT window type. Fixes issue 664. Patch by Alex Converse (alex converse gmail com) Originally committed as revision 15776 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Correct documentation of ch_select array.Alex Converse2008-10-061-2/+2
| | | | | | Patch by Alex Converse (alex converse gmail com) Originally committed as revision 15574 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-311-3/+3
| | | | | | | | | Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use ff_imdct_half() and vector_fmul_window() for IMDCT and windowing. ReduceRobert Swain2008-08-221-3/+2
| | | | | | | buffer sizes accordingly. This produces a ~10% overall decoding perfomance improvement. Originally committed as revision 14908 to svn://svn.ffmpeg.org/ffmpeg/trunk
* More OKed AAC decoder code hunksRobert Swain2008-08-181-0/+12
| | | | Originally committed as revision 14829 to svn://svn.ffmpeg.org/ffmpeg/trunk
* More OKed AAC decoder code hunksRobert Swain2008-08-181-0/+8
| | | | Originally committed as revision 14828 to svn://svn.ffmpeg.org/ffmpeg/trunk
* More OKed AAC decoder hunksRobert Swain2008-08-151-0/+3
| | | | Originally committed as revision 14774 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Synchronise AAC decoder code with that from SoCRobert Swain2008-08-151-4/+1
| | | | Originally committed as revision 14772 to svn://svn.ffmpeg.org/ffmpeg/trunk
* More OKed sections of AAC decoder codeRobert Swain2008-08-151-0/+46
| | | | Originally committed as revision 14770 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud