1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Commit Graph

172 Commits

Author SHA1 Message Date
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
Michael Niedermayer
02af2269c0 check for error
Originally committed as revision 4183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-05 20:05:41 +00:00
Michael Niedermayer
f86f4481d8 cast to uint32 as the table is uint32_t, this also worksaround a gcc or libc bug related to frexp()
Originally committed as revision 3997 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-03-02 20:46:06 +00:00
Måns Rullgård
88730be651 kill warnings patch by (Måns Rullgård <mru inprovide com>)
Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-24 19:08:50 +00:00
Roberto Togni
d2a7718df9 Multichannel mp3 in mp4 support ISO/IEC 14496-3:2001/FPDAM 3 (MP3onMP4)
Derived from MPlayer patch by Larry Ruedisueli

Originally committed as revision 3955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-15 20:58:32 +00:00
Michael Niedermayer
44f1698a38 merge a few shifts into the dequantization, faster and more accurate, lets hope it doesnt overflow
Originally committed as revision 3930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-03 03:28:27 +00:00
Michael Niedermayer
125d624610 optimizing imdct12
Originally committed as revision 3929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-02 22:38:28 +00:00
Michael Niedermayer
ce4a29c066 optimize antialias
switch to integer antialias code as default as its faster now

Originally committed as revision 3925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-02 01:37:33 +00:00
Michael Niedermayer
d04728bb57 faster, simpler and more accurate l3_unscale()
Originally committed as revision 3924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-01 23:43:07 +00:00
Michael Niedermayer
711ae726f7 optimizing imdct36()
Originally committed as revision 3923 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-01 21:27:18 +00:00
Michael Niedermayer
a3a5f4d6c3 support 32bit output for the mpeg audio decoder
Originally committed as revision 3910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-31 12:16:21 +00:00
Michael Niedermayer
b696d2a676 more accurate dequant of near zero coefficients
Originally committed as revision 3909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-31 04:06:47 +00:00
Michael Niedermayer
84af4a7ee6 10l (missing overflow check)
Originally committed as revision 3908 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-31 03:14:22 +00:00
Michael Niedermayer
093c6e50c9 10l (didnt test code after cvs up ...)
Originally committed as revision 3904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-30 14:10:30 +00:00
Michael Niedermayer
a7a858996f dithering for the mpeg audio decoder
Originally committed as revision 3903 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-30 14:04:56 +00:00
Alex Beregszaszi
bf1f4da01f exported ff_mpa_synth_filter for upcoming qdm2 decoder
Originally committed as revision 3897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-28 19:54:10 +00:00
Roberto Togni
1ede228a4f Decode MP3 in ADU format
Originally committed as revision 3839 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-15 14:59:47 +00:00
Michael Niedermayer
2fc8ea249f dissallow sprintf
Originally committed as revision 3823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-12 00:59:42 +00:00
Michael Niedermayer
caa336b4cc common.c -> bitstream.c (and the single non bitstream func -> utils.c)
common.h -> common.h/bitstream.h

Originally committed as revision 3777 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-29 17:50:25 +00:00
Burkhard Plaum
073c2593c9 Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
Originally committed as revision 3717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-27 18:10:06 +00:00
Alex Beregszaszi
491c4a1005 warning fix
Originally committed as revision 3258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-26 10:09:58 +00:00
Michael Niedermayer
53db1cae1c data_size = 0 cleanup
Originally committed as revision 3146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-21 14:37:16 +00:00
Michael Niedermayer
8d1f2ba5e1 static allocation rewrite (old code was plain a broken mess)
doesnt call realloc every time
 doesnt randomly overwrite memory after after 8-16 calls
 doesnt use ugly macro wraper
 fewer lines of code

Originally committed as revision 2912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-21 21:58:14 +00:00
Michael Niedermayer
2caa92d935 fixes by Gildas Bazin <gbazin at altern dot org>
Originally committed as revision 2745 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-04 15:49:55 +00:00
Michael Niedermayer
ac806113fe 10l
Originally committed as revision 2726 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-26 19:14:02 +00:00
Steven M. Schultz
84f986c0f4 lrintf patch by ("Steven M. Schultz" <sms at 2BSD dot COM>)
Originally committed as revision 2680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-08 23:51:23 +00:00
Michael Niedermayer
a1e257b231 optimize compute_antialias() and add a floating point based alternative (2x faster)
Originally committed as revision 2679 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-08 21:08:57 +00:00
Fabrice Bellard
962d6ae6c5 exported mpa_decode_header for new parser API
Originally committed as revision 2491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-10 15:21:16 +00:00
Fabrice Bellard
98ce5991d7 update sub_id in mpegaudio decoding (might need same method as MPEG2VIDEO too ?)
Originally committed as revision 2238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 22:49:26 +00:00
Fabrice Bellard
80783dc2c2 CODEC_ID_MP3LAME is obsolete
Originally committed as revision 2232 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-09-08 22:04:29 +00:00
Fabrice Bellard
8c5b5683ae fixed audio frame buffering problem (should correct problems on some streams) - faster synthesis filter - prototype 'parse_only' support
Originally committed as revision 2173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-28 13:38:06 +00:00
Fabrice Bellard
228ef9dde1 memmove fixes (Jon Burgess)
Originally committed as revision 2157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-08-24 22:01:33 +00:00
Michael Niedermayer
a05c8d7177 merging a small amount of the changes from BroadQ, the rest is either not clean / doesnt apply / or is PS2 specific (someone with a PS2 should merge/send a patch for the later)
Originally committed as revision 1690 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-18 17:22:23 +00:00
Michael Niedermayer
983e3246b7 per file doxy
Originally committed as revision 1634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-03-06 11:32:04 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-11 16:35:48 +00:00
Zdenek Kabelac
5c91a6755b * static,const,compiler warning cleanup
Originally committed as revision 1567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-10 09:35:32 +00:00
Michael Niedermayer
68f593b484 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
Originally committed as revision 1486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-01-21 17:34:12 +00:00