summaryrefslogtreecommitdiff
path: root/libavcodec/mpegaudio.h
Commit message (Collapse)AuthorAgeFilesLines
* mp3dec: adjust IMDCT scaling to avoid overflowsMichael Niedermayer2012-08-021-0/+2
| | | | | | Fixes ticket268 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-211-37/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: configure: make executable again LATM/AAC: Free previously initialized context on reinit. configure: Do not unconditionally add -Wall to host CFLAGS. configure: Set OS/2 objformat to a.out. Add support for a.out object format to assembler macros. fate: disable threading for encoding fate: add comment field fate: allow overriding default build and install dirs mpegtsenc: Add an AVClass pointer to the private data mpegaudio: clean up #includes mpegaudio: move all header parsing to mpegaudiodecheader.[ch] Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegaudio: move all header parsing to mpegaudiodecheader.[ch]Mans Rullgard2011-05-201-37/+1
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-201-87/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: qdm2: Use floating point synthesis filter. h264: correct border check. h264: fix loopfilter with threading at slice boundaries. Fix ff_mpa_synth_filter_fixed() prototype Rename costablegen.c ---> cos_tablegen.c. Collapse tableprint.c into tableprint.h. Simplify trig table rules Remove potentially unstable filenames from comments in generated files. Ignore generated tables and generated table generator programs. Simplify CLEANFILES make variable by using wildcards. Remove silly insults from avformat_version() Doxygen documentation. mpegaudiodsp: fix x86 and ppc makefiles configure: Adjust AVX assembler check. mpegaudio: remove unused version of SAME_HEADER_MASK mpegaudio: remove useless #undef at end of file asfdec: add missing #include for av_bswap32() mpegaudio: merge two #if CONFIG_FLOAT blocks mpegaudio: move some struct definitions from mpegaudio.h Move some mpegaudio functions to new mpegaudiodsp subsystem Conflicts: libavcodec/h264.c libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegaudio: remove unused version of SAME_HEADER_MASKMans Rullgard2011-05-191-4/+0
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegaudio: merge two #if CONFIG_FLOAT blocksMans Rullgard2011-05-191-6/+3
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegaudio: move some struct definitions from mpegaudio.hMans Rullgard2011-05-191-55/+0
| | | | | | | | | | | | | | These structs are only used in mpegaudiodec.c, so move them there and remove no longer needed #include lines from mpegaudio.h. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Move some mpegaudio functions to new mpegaudiodsp subsystemMans Rullgard2011-05-191-23/+1
| | | | | | | | | | | | | | | | This separation allows these functions to be used in a cleaner fashion from other codecs (e.g. qdm2) and simplifies creating optimised versions of them. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-181-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fix compilation of iirfilter-test. libx264: handle closed GOP codec flag lavf: remove duplicate assignment in avformat_alloc_context. lavf: use designated initializers for AVClasses. flvdec: clenup debug code asfdec: fix possible overread on broken files. asfdec: do not fall back to binary/generic search asfdec: reindent after previous commit c7bd5ed asfdec: fallback to binary search internally mpegaudio: add _fixed suffix to some names Modify x86util.asm to ease transitioning to 10-bit H.264 assembly. dct: build dct32 as separate object files qdm2: include correct header for rdft Conflicts: ffpresets/libx264-fast.ffpreset ffpresets/libx264-fast_firstpass.ffpreset ffpresets/libx264-faster.ffpreset ffpresets/libx264-faster_firstpass.ffpreset ffpresets/libx264-medium.ffpreset ffpresets/libx264-medium_firstpass.ffpreset ffpresets/libx264-placebo.ffpreset ffpresets/libx264-placebo_firstpass.ffpreset ffpresets/libx264-slow.ffpreset ffpresets/libx264-slow_firstpass.ffpreset ffpresets/libx264-slower.ffpreset ffpresets/libx264-slower_firstpass.ffpreset ffpresets/libx264-superfast.ffpreset ffpresets/libx264-superfast_firstpass.ffpreset ffpresets/libx264-ultrafast.ffpreset ffpresets/libx264-ultrafast_firstpass.ffpreset ffpresets/libx264-veryfast.ffpreset ffpresets/libx264-veryfast_firstpass.ffpreset ffpresets/libx264-veryslow.ffpreset ffpresets/libx264-veryslow_firstpass.ffpreset libavformat/flvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegaudio: add _fixed suffix to some namesMans Rullgard2011-05-171-3/+3
| | | | | | | | | | | | | | | | This adds a _fixed suffix to the fixed-point versions of things with both float and fixed-point variants. This makes it more consistent with other dual-implementation things, e.g. fft. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-171-12/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12 files changed, 36 insertions(+), 81 deletions(-) yes thats 36 new lines in 14 commits * qatar/master: ffmpeg: fix -aspect cli option Restructure video filter implementation in ffmpeg.c. ffplay: remove audio_write_get_buf_size() forward declaration lavfi: print key-frame and picture type information in ff_dlog_ref() mathops: remove ancient confusing comment cws2fws: Improve error message wording. tools: Check the return value of write(). mpegaudio: move OUT_FMT macro to mpegaudiodec.c mpegaudio: remove OUT_MIN/MAX macros Add missing #includes to mp3_header_(de)compress bsf dct: fix indentation dct: bypass table allocation for DCT_II of size 32 h264dsp_mmx: Add #ifdefs around some mmxext functions on x86_64. Remove unused header mpegaudio3.h. Conflicts: ffmpeg.c libavcodec/mpegaudio.h libavcodec/mpegaudio3.h libavfilter/avfilter.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegaudio: move OUT_FMT macro to mpegaudiodec.cMans Rullgard2011-05-161-2/+0
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegaudio: remove OUT_MIN/MAX macrosMans Rullgard2011-05-161-2/+0
| | | | | | | | | | | | | | | | These macros are no longer needed after the s32 output was removed. Change the relevant code to use av_clip_int16() instead of using explicit limits. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | mpegaudio: remove frame_count variable and its only usage, it is always 0.Reimar Döffinger2011-05-101-3/+0
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-101-4/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegaudiodec: group #includes more sanely mpegaudio: remove #if 0 blocks ffmpeg.c: reset avoptions after each input/output file. ffmpeg.c: store per-output stream sws flags. mpegaudio: remove CONFIG_MPEGAUDIO_HP option mpegtsenc: Clear st->priv_data when freeing it udp: Fix receiving RTP data over multicast rtpproto: Remove an unused variable regtest: fix wma tests NOT pulled: mpegaudio: remove CONFIG_AUDIO_NONSHORT regtest: separate flags for encoding and decoding Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegaudio: remove CONFIG_MPEGAUDIO_HP optionMans Rullgard2011-05-091-4/+1
| | | | | | | | | | | | | | The low quality mode is off by default and never tested. The high quality mode is also plenty fast enough. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegaudio: remove CONFIG_AUDIO_NONSHORTMans Rullgard2011-05-091-8/+0
| | | | | | | | | | | | | | | | This fake option cannot be enabled by normal means, and the floating-point decoder should provide the higher quality this option presumably was intended for. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'newdev/master'Michael Niedermayer2011-03-211-1/+1
|\ \ | |/ | | | | Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Move dct and rdft definitions to separate filesMans Rullgard2011-03-201-1/+1
| | | | | | | | | | | | | | 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>
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/ | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini2010-11-121-3/+3
| | | | | | SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Altivec-optimized mp{1,2,3} windowingVitor Sessak2010-07-011-0/+1
| | | | Originally committed as revision 23943 to svn://svn.ffmpeg.org/ffmpeg/trunk
* More mp{1,2,3} 32-point DCT transform to our common DCT framework.Vitor Sessak2010-06-301-0/+4
| | | | | | Should allow for future SIMD optimizations. Originally committed as revision 23912 to svn://svn.ffmpeg.org/ffmpeg/trunk
* SSE-optimized MP3 floating point windowing functionsVitor Sessak2010-06-241-0/+2
| | | | Originally committed as revision 23750 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize the mpegaudio windowing code in a function and call it by aVitor Sessak2010-06-191-1/+4
| | | | | | function pointer. Should allow for ASM optimizations. Originally committed as revision 23646 to svn://svn.ffmpeg.org/ffmpeg/trunk
* float based mp1/mp2/mp3 decoders.Michael Niedermayer2010-05-111-7/+24
| | | | Originally committed as revision 23095 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
* 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
* Move array specifiers outside DECLARE_ALIGNED() invocationsMåns Rullgård2010-01-221-2/+2
| | | | Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Reduce stack memory allocation in MP3 decoderVitor Sessak2009-11-041-1/+20
| | | | Originally committed as revision 20451 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mpegaudiodec, mpc and qdm2 all use the same mpa_synth window, so makeReimar Döffinger2009-10-191-0/+1
| | | | | | | them use the same variable/global storage. Saves 4 kB in .bss. Originally committed as revision 20314 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove some unnecessary alignment specifiersMåns Rullgård2009-08-261-1/+1
| | | | | | None of these arrays are used in ways requiring extra alignment. Originally committed as revision 19715 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename bitstream.h to get_bits.h.Stefano Sabatini2009-04-131-1/+1
| | | | Originally committed as revision 18494 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
* Avoid allocating MPADecodeContext on stack.Andreas Öman2009-01-231-10/+17
| | | | | | | Instead move relevant fields into MPADecodeHeader and use it where appropriate. Originally committed as revision 16728 to svn://svn.ffmpeg.org/ffmpeg/trunk
* explicitly disable CONFIG_AUDIO_NONSHORTAurelien Jacobs2009-01-161-0/+2
| | | | Originally committed as revision 16620 to svn://svn.ffmpeg.org/ffmpeg/trunk
* simplify: group all the AUDIO_NONSHORT parameters in the same placeAurelien Jacobs2009-01-141-0/+2
| | | | Originally committed as revision 16602 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Replace #ifdef CONFIG_ preprocessor check by #if CONFIG_.Diego Biurrun2009-01-141-2/+2
| | | | | | CONFIG_ changed semantics and is always defined now. Originally committed as revision 16598 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use CONFIG_MPEGAUDIO_HP directly instead of USE_HIGHPRECISION indirection.Diego Biurrun2009-01-141-5/+2
| | | | Originally committed as revision 16594 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change mpeg audio parser so it only sets frame_size, channels and bit_rateMichael Niedermayer2008-12-211-1/+1
| | | | | | | after it has a few valid frames. Fixes issue762 Originally committed as revision 16259 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Rename error_resilience to error_recognition.Michael Niedermayer2008-09-081-1/+1
| | | | Originally committed as revision 15270 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
* Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun2007-10-171-3/+3
| | | | Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move a couple of macros and structs to mpegaudio.hMåns Rullgård2007-06-161-0/+11
| | | | Originally committed as revision 9343 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove dependency of mpeg audio encoder over mpeg audio decoderAurelien Jacobs2007-05-201-1/+2
| | | | Originally committed as revision 9082 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add a ff_ prefix to some mpegaudio funcsAurelien Jacobs2007-05-201-1/+1
| | | | Originally committed as revision 9081 to svn://svn.ffmpeg.org/ffmpeg/trunk
* loosen dependencies over mpegaudiodecAurelien Jacobs2007-05-201-0/+44
| | | | Originally committed as revision 9080 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move mp3_header_decompress bitstream filter in its own fileAurelien Jacobs2007-05-191-0/+2
| | | | Originally committed as revision 9062 to svn://svn.ffmpeg.org/ffmpeg/trunk
* move some common mpeg audio tables from mpegaudiodectab.h to mpegaudiodata.cAurelien Jacobs2007-05-191-9/+0
| | | | Originally committed as revision 9060 to svn://svn.ffmpeg.org/ffmpeg/trunk
* dont set the sampling rate just because 1 mp3 packet header says so (fixes ↵Michael Niedermayer2006-10-301-1/+1
| | | | | | playback speed on some old mencoder generated avis which where then dumped to mp3) Originally committed as revision 6837 to svn://svn.ffmpeg.org/ffmpeg/trunk
View Lorry Controller Status