summaryrefslogtreecommitdiff
path: root/libavcodec/mpegaudiodec.c
Commit message (Collapse)AuthorAge
* Merge remote branch 'qatar/master'Michael Niedermayer2011-05-17
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-16
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegaudio: remove OUT_MIN/MAX macrosMans Rullgard2011-05-16
| | | | | | | | | | | | | | | | 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-10
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * mpegaudiodec: group #includes more sanelyMans Rullgard2011-05-09
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegaudio: remove #if 0 blocksMans Rullgard2011-05-09
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegaudio: remove CONFIG_MPEGAUDIO_HP optionMans Rullgard2011-05-09
| | | | | | | | | | | | | | 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>
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-03
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Fixed-point MDCT with 32-bit unscaled output lavc: deprecate rate_emu lavc: mark hurry_up for removal on next major bump parser: mark av_parser_parse() for removal on next major bump lavc: add missing audioconvert includes jvdec: don't use deprecated CODEC_TYPE_*/PKT_FLAG_KEY Conflicts: libavcodec/h264.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add missing audioconvert includesAnton Khirnov2011-04-02
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Set channel_layout for mpegaudioKieran Kunhya2011-02-05
| | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
| * Remove a few if (p) av_free(p) formsClément Bœsch2011-02-03
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Replace dprintf with av_dlogLuca Barbato2011-01-29
| | | | | | | | dprintf clashes with POSIX.1-2008
| * Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-26
| | | | | | | | | | | | | | None of these symbols should be accessed directly, so declare them as hidden. Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Move ID3v1 skip from decoder to demuxerClément Bœsch2011-01-22
| | | | | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* | Set channel_layout for mpegaudioKieran Kunhya2011-02-06
| | | | | | | | | | Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit f4a86bc981d6743778dd1037fea243d36229ede1)
* | Remove a few if (p) av_free(p) formsClément Bœsch2011-02-04
| | | | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 437fb1c87d7b4b0730db97d0858b4f39fffff2a9)
* | Replace dprintf with av_dlogLuca Barbato2011-01-30
| | | | | | | | | | dprintf clashes with POSIX.1-2008 (cherry picked from commit dfd2a005eb29e4b9f2fdb97036eb7d5c38ae4bd4)
* | Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.Diego Elio Pettenò2011-01-28
| | | | | | | | | | | | | | | | 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)
* | Move ID3v1 skip from decoder to demuxerClément Bœsch2011-01-23
|/ | | | | Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit 045b80e52df7ba9c97084c946b4929000d5f5bc7)
* Handle ID3v1 tag while decoding mp[123] framesClément Bœsch2011-01-10
| | | | | | patch by Clément Bœsch (ubitux at gmail) Originally committed as revision 26297 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Show correct bitrate for VBR MP3 files.Alexander Kojevnikov2010-07-27
| | | | | | Patch by Alexander Kojevnikov, alexander kojevnikov com Originally committed as revision 24539 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move ff_dct_init(context) out of if(one time init)Michael Niedermayer2010-07-07
| | | | | | fixes calling a null pointer in issue658 Originally committed as revision 24081 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mpegaudio: move compute_antialias_float() to mpegaudiodec_float.cMåns Rullgård2010-07-01
| | | | | | | | | Also put compute_antialias_integer() under !CONFIG_FLOAT and change forward declarations to declare only the relevant one of these. Fixes warnings about unused functions and pointer type mismatches. Originally committed as revision 23950 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mpegaudio: call ff_mpegaudiodec_init_mmx() only from float decoderMåns Rullgård2010-07-01
| | | | | | | | | | | | The mmx code is floating-point only, and this function does not know from which decoder it is called. Without this change, the integer decoder only "works" because the size of the context struct is smaller in this case, and the mmx init function writes the function pointer outside the allocated context. Fixes issue 2054. Originally committed as revision 23949 to svn://svn.ffmpeg.org/ffmpeg/trunk
* adu and mp3on4 functions are also needed by their respective float decodersAurelien Jacobs2010-07-01
| | | | Originally committed as revision 23944 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Altivec-optimized mp{1,2,3} windowingVitor Sessak2010-07-01
| | | | 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-30
| | | | | | Should allow for future SIMD optimizations. Originally committed as revision 23912 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use lookup table to avoid division in mp2 decoderVitor Sessak2010-06-28
| | | | Originally committed as revision 23840 to svn://svn.ffmpeg.org/ffmpeg/trunk
* SSE-optimized MP3 floating point windowing functionsVitor Sessak2010-06-24
| | | | Originally committed as revision 23750 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move float-specific function to mpegaudiodec_float.cVitor Sessak2010-06-23
| | | | Originally committed as revision 23743 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove pointless condition in #ifVitor Sessak2010-06-23
| | | | Originally committed as revision 23742 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix breakage in compilation with --disable-mpegaudio-hp introduced inVitor Sessak2010-06-20
| | | | | | r23646. Originally committed as revision 23656 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize the mpegaudio windowing code in a function and call it by aVitor Sessak2010-06-19
| | | | | | function pointer. Should allow for ASM optimizations. Originally committed as revision 23646 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Optimize 1D DCT transform used in MP{1,2,3}. Makes also this function suitableVitor Sessak2010-06-07
| | | | | | for being moved to the shared DCT framework in the future. Originally committed as revision 23514 to svn://svn.ffmpeg.org/ffmpeg/trunk
* 1.0 and the resulting exactly representable value must be marked as float as ↵Michael Niedermayer2010-05-13
| | | | | | | | well, gcc is hopelessly trash. Originally committed as revision 23119 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Cast constants to float to avoid gcc converting to and fromMichael Niedermayer2010-05-13
| | | | | | float<->double in every operation. Originally committed as revision 23118 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix compilation with low precission mpeg audio decoding.Michael Niedermayer2010-05-13
| | | | Originally committed as revision 23107 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Do the same sign flip optimization to the low freq decoder.Michael Niedermayer2010-05-11
| | | | | | as with the high freq 10-20 cycles faster Originally committed as revision 23099 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Factorize READ_FLIP_SIGN() optimization outMichael Niedermayer2010-05-11
| | | | Originally committed as revision 23098 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Optimize decoding high freqs.Michael Niedermayer2010-05-11
| | | | | | | this is 10-20cpu cycles faster on duron (whole is about 50-60 cpu cylses) I wonder why gcc isnt doing this on its own ... Originally committed as revision 23097 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make lsf_sf_expand() 4 times faster.Michael Niedermayer2010-05-11
| | | | Originally committed as revision 23096 to svn://svn.ffmpeg.org/ffmpeg/trunk
* float based mp1/mp2/mp3 decoders.Michael Niedermayer2010-05-11
| | | | Originally committed as revision 23095 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove unused FRAC_RND() macro from mpegaudiodec.c.Michael Niedermayer2010-05-11
| | | | Originally committed as revision 23086 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-20
| | | | | | | | 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-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Make some functions staticMåns Rullgård2010-03-06
| | | | | | | These functions are not used outside their respective files, and they lack a prototype in a header. Originally committed as revision 22259 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove DECLARE_ALIGNED_{8,16} macrosMåns Rullgård2010-03-06
| | | | | | | 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-22
| | | | Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk