Commit Graph

233 Commits

Author SHA1 Message Date
Diego Biurrun
ad1eebe360 Use CONFIG_MPEGAUDIO_HP directly instead of USE_HIGHPRECISION indirection.
Originally committed as revision 16594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-14 00:48:17 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
Michael Niedermayer
cb595b7f02 Add dummy mp1_decoder to complement the existing dummy mp2/mp3 decoders.
Originally committed as revision 16581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 19:32:08 +00:00
Andreas Öman
11c23b64ac Revert r16257:
Include "libavutil/common.h" where we use llrint() in case ffmpeg's
own llrint() is to be used.

Originally committed as revision 16282 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-22 22:39:55 +00:00
Andreas Öman
1af34f094e Include "libavutil/common.h" where we use llrint() in case ffmpeg's
own llrint() is to be used.

Originally committed as revision 16257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-21 21:53:42 +00:00
Måns Rullgård
4deaa94639 Add shift argument to MULL() macro
This replaces use of FRAC_BITS in the MULL() definition with a third
argument specifying the shift amount.  All uses of this macro are
updated to pass FRAC_BITS as third argument.

Originally committed as revision 15921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-24 09:28:55 +00:00
Aurelien Jacobs
37d3e0667a uses FF_ARRAY_ELEMS() where appropriate
Originally committed as revision 15662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-21 21:40:24 +00:00
Michael Niedermayer
1d4113d053 Only print "invalid new backstep" when it is really invalid.
Fixes issue541.

Originally committed as revision 15339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-16 01:49:32 +00:00
Michael Niedermayer
bf3a971c12 Make decoder more robust by default against broken encoders.
Fixes issue540.

Originally committed as revision 15336 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-16 00:31:32 +00:00
Michael Niedermayer
047599a4ba Rename error_resilience to error_recognition.
Originally committed as revision 15270 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-08 18:18:49 +00:00
Michael Niedermayer
969c163f1f Remove debuging junk that probably hasnt been used by anyone since years.
Originally committed as revision 15133 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 20:26:28 +00:00
Art Clarke
bbdf87285a Use static vlc structure to decode layer 3 huffman tables.
Patch by Art Clarke aclarke vlideshow com

Originally committed as revision 14483 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 12:09:11 +00:00
Andreas Öman
b000c604f2 Decrease severity of 'invalid new backstep' log message to warning
in mpeg audio decoder.

Originally committed as revision 14313 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-20 15:01:20 +00:00
Andreas Öman
11f63a221b Supply context argument to av_log() in mpeg audio decoder.
Originally committed as revision 14312 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-20 14:58:49 +00:00
Måns Rullgård
9ea583e1f6 mpegaudio: use MAC/MLS macros in ff_mpa_synth_filter
Originally committed as revision 14199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-13 12:23:02 +00:00
Stefano Sabatini
fe4bf37455 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 21:50:13 +00:00
Stefano Sabatini
162d4fc99d Add long names to AVCodec declarations.
patch by Stefano Sabatini, stefano.sabatini-lala poste it

Originally committed as revision 13009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 22:39:51 +00:00
Baptiste Coudurier
169203c1d9 break if error in header so it can output already decoded frames
Originally committed as revision 12999 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 14:41:29 +00:00
Baptiste Coudurier
41b8800f88 merge init with declaration
Originally committed as revision 12998 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 14:36:34 +00:00
Baptiste Coudurier
f91c089812 cosmetics: merge decls
Originally committed as revision 12997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 14:34:01 +00:00
Baptiste Coudurier
5fd7a9fcdf simplify: merge loops
Originally committed as revision 12996 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 14:33:09 +00:00
Baptiste Coudurier
8da8970d01 simplify
Originally committed as revision 12995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 14:30:06 +00:00
Baptiste Coudurier
0d5b2eb445 simplify: remove useless fields and vars
Originally committed as revision 12994 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 14:28:18 +00:00
Baptiste Coudurier
676e26ab6d move MP3On4DecodeContext def near the code and under ifdef
Originally committed as revision 12993 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 14:22:43 +00:00
Baptiste Coudurier
9f95bfe2b9 correctly patch syncword for samples rates < 16000, decoder now fully support all iso ref files
Originally committed as revision 12992 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-26 14:18:29 +00:00
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