Commit Graph

208 Commits

Author SHA1 Message Date
Baptiste Coudurier
f0f53c83ba fix 1 frame config decoding
Originally committed as revision 12991 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 14:10:31 +00:00
Baptiste Coudurier
60dfa0b8d4 remove old draft last case not present anymore in iso specs
Originally committed as revision 12990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 14:08:34 +00:00
Baptiste Coudurier
b61d2782f3 use mpeg4audio common code
Originally committed as revision 12988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 13:56:52 +00:00
Baptiste Coudurier
ec39f7d855 simplify
Originally committed as revision 12986 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 13:08:16 +00:00
Baptiste Coudurier
9708d52ee8 correctly compute out_size and samples number
Originally committed as revision 12985 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 13:03:41 +00:00
Baptiste Coudurier
cd3289650a fsize is 12 bits according to specs
Originally committed as revision 12984 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 12:59:46 +00:00
Baptiste Coudurier
5be25fc133 simplify using FFMIN3
Originally committed as revision 12983 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 12:51:52 +00:00
Baptiste Coudurier
a82dcdffb2 return error if buf_size is too small
Originally committed as revision 12981 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 12:39:45 +00:00
Baptiste Coudurier
dfcd6d91fe values can fit uint8_t
Originally committed as revision 12980 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 12:34:37 +00:00
Baptiste Coudurier
183fceaafd add const
Originally committed as revision 12979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 12:33:02 +00:00
Baptiste Coudurier
6122b733e9 omg, fix compilation
Originally committed as revision 12509 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 09:38:55 +00:00
Baptiste Coudurier
d0ed455f19 correctly set avctx->frame_size for mp3on4 and mp3adu
Originally committed as revision 12508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-20 09:36:04 +00:00
Diego Biurrun
5e53486545 typo fix: inited --> initialized
Originally committed as revision 11920 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-13 09:26:10 +00:00
Michael Niedermayer
7993df6527 consts
I have underestimated this a little, and these are just some ...

Originally committed as revision 11708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 03:26:31 +00:00
Michael Niedermayer
9f7458b285 Factorize some code into functions, had this in my tree and will be
needed for mp3 encoding.

Originally committed as revision 11509 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 21:34:05 +00:00
Brian Brice
812f29ffb8 Clear synth_buf on flush(). Part of a patch by Brian Brice bbrice gmail com.
Originally committed as revision 11507 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 18:20:42 +00:00
Brian Brice
4a69055bad Flush mp2 as well on seeking. Part of a patch by Brian Brice bbrice gmail com.
Originally committed as revision 11506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-11 18:18:45 +00:00
Martin Lindhe
3240941b25 Move 2 defines from mpegaudiodec.c to mpegaudiodata.h to allow compilation
when DEBUG is defined.
Patch by Martin Lindhe: martin startwars org

Originally committed as revision 10955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-08 10:53:32 +00:00
Aurelien Jacobs
aee481cebe use av_clip_int16() where it makes sense
Originally committed as revision 10078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-11 22:48:55 +00:00
Alex Beregszaszi
7ae7300ee3 use skip_bits where appropriate
Originally committed as revision 10004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 00:57:36 +00:00
Alex Beregszaszi
5fc32c275e use get_bits1(..) instead get_bits(.., 1)
Originally committed as revision 9999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-09 00:13:31 +00:00
Måns Rullgård
c2d08dc0d7 move a couple of macros and structs to mpegaudio.h
Originally committed as revision 9343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-16 22:58:43 +00:00
Ramiro Polla
2c124cb65c Use AV_xx throughout libavcodec
Originally committed as revision 9169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-02 01:41:07 +00:00
Michael Niedermayer
d5aa01cd30 make decoder decode the first frame properly if theres more than just one
frame input

Originally committed as revision 9144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-27 22:34:49 +00:00
Aurelien Jacobs
08aa2c9bd2 remove dependency of mpeg audio encoder over mpeg audio decoder
Originally committed as revision 9082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-20 22:50:29 +00:00
Aurelien Jacobs
ca6e50afc1 add a ff_ prefix to some mpegaudio funcs
Originally committed as revision 9081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-20 15:11:55 +00:00
Aurelien Jacobs
4bd8e17c8d loosen dependencies over mpegaudiodec
Originally committed as revision 9080 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-20 13:40:07 +00:00
Aurelien Jacobs
677fe2e226 add proper prefix to extern mpeg audio data tables
Originally committed as revision 9061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:13:35 +00:00
Aurelien Jacobs
4991c0516d move some common mpeg audio tables from mpegaudiodectab.h to mpegaudiodata.c
Originally committed as revision 9060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-19 00:06:02 +00:00
Reimar Döffinger
c6bcbb2cd3 Use DECLARE_ALIGNED to ease porting
Originally committed as revision 9031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-15 20:47:55 +00:00
Diego Biurrun
5a6a6cc7dc Fix multiple "‘inline/static’ is not at beginning of declaration" warnings.
Originally committed as revision 8894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-05 12:18:14 +00:00
Diego Biurrun
fe0372296a typos
Originally committed as revision 8642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-07 14:10:02 +00:00
Michael Niedermayer
9608652dc1 kill another 2 av_mallocz_static()
Originally committed as revision 8396 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-14 00:19:56 +00:00
Michel Bardiaux
318c5e0524 Give context to dprintf
Originally committed as revision 8338 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-12 12:36:41 +00:00
Michael Niedermayer
5773d46009 factorize switch_buffer()
Originally committed as revision 7813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-03 13:15:55 +00:00
Michael Niedermayer
e0cf92048a fix decoding of takethat.mp3
Originally committed as revision 7812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-03 12:42:12 +00:00
Michael Niedermayer
2f5560ee49 fix playback of mp3_bits_left.avi
Originally committed as revision 7279 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-11 13:01:20 +00:00
Måns Rullgård
8da9266cea use the standard INT64_C() macro for 64-bit constants
Originally committed as revision 7240 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-12-06 23:46:11 +00:00
Michael Niedermayer
8e5606bfcd detect a few more errors (fixes libmp3-bug.avi again)
make pickyness of the decoder user selectable through error_resilience param like for video decoders

Originally committed as revision 7089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-15 17:58:35 +00:00
Michael Niedermayer
ee50a7c1e5 making decoding more error robust
Originally committed as revision 7073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 22:06:28 +00:00
Michael Niedermayer
9bb328d397 reset internal buffer during seeking
Originally committed as revision 7070 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 20:39:20 +00:00
Michael Niedermayer
bd60e11bf4 more checks and error messages
Originally committed as revision 7069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-14 20:35:15 +00:00
Michael Niedermayer
498c544ad2 dont set the sampling rate just because 1 mp3 packet header says so (fixes 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
2006-10-30 02:19:55 +00:00
Michael Niedermayer
c0d8052b50 avoid random noise on damaged frames
Originally committed as revision 6836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-30 01:29:56 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Diego Biurrun
e1931c59f6 message typo fixes
Originally committed as revision 6564 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-05 18:15:17 +00:00
Måns Rullgård
62bb489b13 add some #ifdef CONFIG_ENCODERS/DECODERS
Originally committed as revision 6356 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-27 19:54:07 +00:00
Måns Rullgård
191e8ca752 fix some signedness warnings
Originally committed as revision 6355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-27 19:47:39 +00:00
Luca Barbato
004390a639 Use mathops
Originally committed as revision 6323 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-22 15:57:23 +00:00
Michael Niedermayer
39e1b5cf8e use correct rounding functions
this should fix a floating point exception on some systems
lets hope these arent missing anywhere, if so another solution must be found

Originally committed as revision 6290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-19 09:31:00 +00:00
Baptiste Coudurier
8e453fc3c7 remove unused, uninitialized free format frame size
Originally committed as revision 6256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-15 10:28:23 +00:00
Siarhei Siamashka
1839e854e5 Proper armv5te instructions support detection.
patch by Siarhei Siamashka, siarhei dot siamashka gmail com

Originally committed as revision 6246 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-13 21:39:41 +00:00
Siarhei Siamashka
024da4b146 armv5 optimizations
patch by Siarhei Siamashka siarhei.siamashka at gmail com

Originally committed as revision 6228 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-10 22:29:02 +00:00
Michael Niedermayer
7b95bc5842 print more correct error messges
Originally committed as revision 6194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-08 08:27:51 +00:00
Måns Rullgård
0e176c3eb5 remove redundant declarations
Originally committed as revision 6153 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-09-02 23:10:28 +00:00
Michael Niedermayer
1b4f17fafa fix buffer handling
Originally committed as revision 6116 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-28 16:15:40 +00:00
Michael Niedermayer
ee3bc9d386 overread AV_LOG_ERROR -> AV_LOG_DEBUG
Originally committed as revision 6111 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-27 21:45:26 +00:00
Michael Niedermayer
c0c66dd81d fix low bitrate mp3
Originally committed as revision 6107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-27 11:42:40 +00:00
Michael Niedermayer
39b434c6ae check the validity of the amount of the remaining bytes in the bitsteam before memcpy
Originally committed as revision 6105 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-27 07:19:11 +00:00
Michael Niedermayer
716d73b47d unused var
Originally committed as revision 6104 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-26 20:16:54 +00:00
Michael Niedermayer
d6bea62338 make mpa_decode_header() 10 times faster
Originally committed as revision 6101 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-26 18:02:52 +00:00
Michael Niedermayer
731d0b1aaa another silly typo which surprisingly neither valgrind nor cmp of the file output cought
Originally committed as revision 6100 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-26 17:29:31 +00:00
Michael Niedermayer
d37bb9d8c1 10l found by valgrind
Originally committed as revision 6099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-26 15:24:13 +00:00
Michael Niedermayer
06e7fb82a4 remove duplicated parser, people who pass random gibblets of the bitstream into the decoder will have to pass it through a AVParser like for all other codecs too
remove silly internal buffering architecture (removes 1 memcpy() of the bitstream)
mp3on4 and mp3adu untested

Originally committed as revision 6098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-26 12:19:05 +00:00
Michael Niedermayer
9bffa9e7af avoid branch
Originally committed as revision 6088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-25 14:42:32 +00:00
Michael Niedermayer
14168ddb28 move variable declarations so that their scope is smaller
Originally committed as revision 6087 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-25 13:58:27 +00:00
Michael Niedermayer
bc2d2757bb move the +400 out of the innermost loop
Originally committed as revision 6086 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-25 13:46:56 +00:00
Michael Niedermayer
9b49f89cdf avoid reading exponent twice
Originally committed as revision 6085 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-25 13:36:27 +00:00
Michael Niedermayer
1f1d675b68 reduce size of vlc table, thats slightly faster here
Originally committed as revision 6084 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-25 12:26:34 +00:00
Michael Niedermayer
55017f35da try to avoid l3_unscale() by using a table
Originally committed as revision 6083 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-25 11:55:20 +00:00
Michael Niedermayer
f8347c4167 replace l3_unscale(1, exponents[pos]) by LUT
Originally committed as revision 6082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-25 10:00:30 +00:00
Michael Niedermayer
7ca1ed0d9c maybe fixing the segfault on ARM
Originally committed as revision 6081 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-25 02:40:52 +00:00
Michael Niedermayer
92c5cb62b0 10l typo
Originally committed as revision 6074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 12:35:53 +00:00
Michael Niedermayer
e90a72701e avoid a few if(x==0) checks in the inner loops
Originally committed as revision 6073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 11:18:41 +00:00
Michael Niedermayer
6430ce0f72 optimize reorder_block() though this function seems to be executed too rarely for this to make much difference
Originally committed as revision 6068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 08:40:09 +00:00
Michael Niedermayer
a753e55bb5 simplify
Originally committed as revision 6067 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 08:39:07 +00:00
Michael Niedermayer
a08a502eda dont copy the whole GetBitContext around
Originally committed as revision 6062 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 06:57:32 +00:00
Michael Niedermayer
3328ec6331 faster handling of zero coeffs in the low freq decode
Originally committed as revision 6061 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 01:12:26 +00:00
Michael Niedermayer
3c693e7743 optimizing high freq decode
Originally committed as revision 6060 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 01:01:39 +00:00
Michael Niedermayer
daf4cd9ac3 use memset() instead of slow c loops
Originally committed as revision 6059 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-24 00:03:51 +00:00
Michael Niedermayer
c7aa36964e simplify
Originally committed as revision 6058 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-23 23:40:03 +00:00
Aurelien Jacobs
acba32385b fix arm asm compilation in mpegaudiodec
Originally committed as revision 6057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-23 23:39:27 +00:00
Michael Niedermayer
69fd15f871 MUL* for ARM code based on a patch by Siarhei Siamashka
untested

Originally committed as revision 6050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-22 13:25:09 +00:00
Michael Niedermayer
f617adedc8 replace MULL with asm too, no significnat speedup but its probably better to not take any chances, some versions of gcc will almost certainly mess it up too if they can
Originally committed as revision 6049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-22 12:07:02 +00:00
Michael Niedermayer
47a0cd7408 replacing MULH by asm for x86
about 30% faster imdct36()

Originally committed as revision 6048 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-22 11:51:09 +00:00
Michael Niedermayer
5ab1972b53 indent preprocessor directives
Originally committed as revision 6047 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-22 11:16:47 +00:00
Michael Niedermayer
355903f5a8 make high precission synth filter 3 times faster on x86
Originally committed as revision 6046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-22 11:11:04 +00:00
Michael Niedermayer
0bd2483a75 replace MULL by MULH + shift in dct32() (code is very slightly faster, and the compiler should be able to optimize the shift away on 64bit archs)
Originally committed as revision 6045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-22 06:24:59 +00:00
Michael Niedermayer
eb6447766d replace a few MULL by MULH
Originally committed as revision 6039 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-21 12:12:43 +00:00
Michael Niedermayer
120aad7fe9 reorder butterflies to reduce memory load/store
Originally committed as revision 6037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-20 22:18:26 +00:00
Michael Niedermayer
55582f8de3 table contains vlc with 19 bits and 8*2 < 19
Originally committed as revision 5658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-07 10:50:14 +00:00
Steve L'Homme
267f7edcd1 (f)printf --> av_log conversion
taken from a patch by Steve L'Homme

Originally committed as revision 5127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-08 11:43:10 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Benjamin Larsson
fb9cb0b8c4 get_vlc -> get_vlc2 transition.
Originally committed as revision 4828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-08 19:31:21 +00:00
Diego Biurrun
bb270c0896 COSMETICS: tabs --> spaces, some prettyprinting
Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-22 01:10:11 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Roberto Togni
d9b1c197e5 QDM2 compatible decoder
Originally committed as revision 4649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-18 20:16:43 +00:00
Roberto Togni
e6885654eb Reverse patch 1.59->1.60, it break mp3 in ffplay and ffmpeg
Reversing approved by patch author

Originally committed as revision 4646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-15 16:29:58 +00:00
Alex Beregszaszi
83254e245c removed unused CONFIG_AUDIO_NONSHORT
Originally committed as revision 4633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-10-12 22:37:42 +00:00
Michael Niedermayer
c26ae41db2 adding a few const
Originally committed as revision 4337 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-06-01 21:19:00 +00:00