Commit Graph

282 Commits

Author SHA1 Message Date
Justin Ruggles
c763f86728 silence a gcc warning about using an uninitialized variable
Originally committed as revision 15814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-13 03:18:24 +00:00
Justin Ruggles
66561189a1 cosmetics: indentation
Originally committed as revision 15813 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-13 03:18:18 +00:00
Justin Ruggles
0cc51734b2 add support for spectral extension
Originally committed as revision 15812 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-13 03:18:13 +00:00
Justin Ruggles
0c5d750df9 add a generic function to decode banding structure for coupling, spectral
extension, or enhanced coupling

Originally committed as revision 15811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-13 03:18:07 +00:00
Justin Ruggles
6c6f927289 add a line break in error message text
Originally committed as revision 15810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-13 03:18:01 +00:00
Justin Ruggles
6ee6d068f7 simplify decoding of coupling frequency range
Originally committed as revision 15809 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-13 03:17:56 +00:00
Justin Ruggles
24834c1928 cosmetics: rename two variables
Originally committed as revision 15808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-13 03:17:50 +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
Justin Ruggles
2988c93d94 create a separate codec_id for E-AC-3
Originally committed as revision 15143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 14:33:54 +00:00
Justin Ruggles
1f6a594de4 turn on E-AC-3 decoding support and update the Changelog
Originally committed as revision 15103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 03:08:18 +00:00
Justin Ruggles
f2e4eb62dc cosmetics: indentation
Originally committed as revision 15089 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:32:08 +00:00
Justin Ruggles
8dfc56ec32 commit more OKed parts of the E-AC-3 decoder
Originally committed as revision 15087 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-31 02:30:09 +00:00
Justin Ruggles
225c30429d commit more OKed parts of the E-AC-3 decoder
Originally committed as revision 15068 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 23:19:23 +00:00
Justin Ruggles
ea364c74a0 cosmetics: update comment about dithering
Originally committed as revision 15051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-30 17:51:03 +00:00
Justin Ruggles
e522bd49c8 cosmetics: change another "get" to "decode"
Originally committed as revision 15014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 00:09:47 +00:00
Justin Ruggles
164e169fef cosmetics: change "get" to "decode"
Originally committed as revision 15013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-29 00:06:43 +00:00
Justin Ruggles
86662b1c89 cosmetics: indentation
Originally committed as revision 15012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 23:16:21 +00:00
Justin Ruggles
260e09305b remove unneeded variable, dither_all
Originally committed as revision 15011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-28 23:04:15 +00:00
Justin Ruggles
aec0407faf cosmetics: indent after last commit
Originally committed as revision 15001 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 23:23:54 +00:00
Justin Ruggles
6b4bfed965 do not read exponent strategies from each block for E-AC-3 since they are in the header
Originally committed as revision 15000 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 23:11:05 +00:00
Justin Ruggles
0ffea2439b copy default coupling band structure from table to decoding context (used for E-AC-3)
Originally committed as revision 14990 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 01:40:46 +00:00
Justin Ruggles
e43b29ab26 add more OKed parts of the E-AC-3 decoder: structural changes to support AHT mode mantissa decoding
Originally committed as revision 14989 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 01:36:20 +00:00
Justin Ruggles
6a68105e2b cosmetics: rename some functions from *get_* to *decode_*
Originally committed as revision 14988 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-27 01:24:43 +00:00
Justin Ruggles
63d72fb167 fix decoding of coupling leak info for normal AC-3
Originally committed as revision 14913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 03:30:08 +00:00
Justin Ruggles
0569993ea4 cosmetics: indentation
Originally committed as revision 14911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 01:55:52 +00:00
Justin Ruggles
6fafb0202a add some approved parts of the E-AC-3 decoder
Originally committed as revision 14910 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-23 01:51:42 +00:00
Justin Ruggles
ab2a942ad8 cosmetics: indentation
Originally committed as revision 14863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 01:02:32 +00:00
Justin Ruggles
bf09b550e6 commit the OKed parts of the E-AC-3 decoder
Originally committed as revision 14860 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:32:17 +00:00
Justin Ruggles
e630027686 get data size based on the actual data array instead of coding-in the calculation
Originally committed as revision 14859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:15:27 +00:00
Justin Ruggles
8e33132bab rename AC3_MAX_FRAME_SIZE to AC3_FRAME_BUFFER_SIZE and increase the size
Originally committed as revision 14858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 00:08:59 +00:00
Justin Ruggles
46dd2738ae remove some unneeded header includes
Originally committed as revision 14819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 19:56:28 +00:00
Justin Ruggles
ec0350c983 use LFG instead of Mersenne Twister for AC-3 PRNG
Originally committed as revision 14815 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 17:41:48 +00:00
Justin Ruggles
38c1a5c4d9 update my email address to one which does not depend on my service provider
Originally committed as revision 14797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 22:42:59 +00:00
Loren Merritt
911e21a306 simd int->float
20% faster ac3 if downmixing, 15% if not

Originally committed as revision 14743 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 23:35:40 +00:00
Loren Merritt
ac2e556456 simd downmix
13% faster ac3 if downmixing

Originally committed as revision 14742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 23:33:48 +00:00
Loren Merritt
45d9d61889 don't mark the delayed samples for upmixing if they haven't been downmixed
Originally committed as revision 14741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 23:30:53 +00:00
Loren Merritt
3b6516f7e7 oops, non-normalized downmix to mono contaminated add_bias for non-simd float-to-int.
Originally committed as revision 14740 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 23:30:28 +00:00
Loren Merritt
557ac0c448 optimize ac3_downmix.
1.3x faster 5.1->stereo, 1.9x faster 5.1->mono.

Originally committed as revision 14719 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 23:45:46 +00:00
Loren Merritt
72745cff20 use float_to_int16_interleave in ac3
Originally committed as revision 14706 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 03:01:17 +00:00
Loren Merritt
916d5d6c32 use imdct_half in ac3
Originally committed as revision 14705 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 01:30:24 +00:00
Loren Merritt
d46ac5bfde mdct wrapper function to match fft
Originally committed as revision 14703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:38:30 +00:00
Loren Merritt
0a570e826d remove mdct tmp buffer
Originally committed as revision 14702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:36:36 +00:00
Justin Ruggles
5e3e40756e cosmetics: use a better function name than uncouple_channels()
Originally committed as revision 14614 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 01:49:01 +00:00
Justin Ruggles
022845ed05 cosmetics: change function name and comments to refer to block decoding
instead of block parsing

Originally committed as revision 14613 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 01:31:40 +00:00
Justin Ruggles
ba7f712c21 remove unneeded local variable
Originally committed as revision 14547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-05 00:32:27 +00:00
Justin Ruggles
55aff0d901 Read bitstream parameters for E-AC-3 streams before returning an error.
Originally committed as revision 14528 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 22:29:06 +00:00
Justin Ruggles
602116df9b Hardcode the table for ungrouping 3 values in 5 bits. It will be reused by
the E-AC-3 decoder.

Originally committed as revision 14527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 21:42:43 +00:00
Justin Ruggles
7417120b6f use the same table for ungrouping exponents and bap=2 mantissas
Originally committed as revision 14525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 19:24:04 +00:00
Justin Ruggles
14b7062829 cosmetics: make all references to AC-3 capitalized and hyphenated
Originally committed as revision 14523 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-03 16:42:32 +00:00
Peter Ross
fd76c37fd9 Modify all codecs to report their supported input and output sample format(s).
Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 10:47:31 +00:00
Justin Ruggles
4760aec6a0 read 'coupling in use' parameter from bitstream into decoder context first,
then copy to the local variable.

Originally committed as revision 14311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 22:01:46 +00:00
Justin Ruggles
7645da9194 cosmetic: use hex value instead of decimal to show relation to 0x7FFFFF
Originally committed as revision 14290 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-19 02:54:54 +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
Justin Ruggles
227322b837 move rematrixing band table to ac3dec_data.c
Originally committed as revision 13716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-08 21:09:02 +00:00
Justin Ruggles
4397d95ce0 split up header parsing function
Originally committed as revision 13705 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 22:30:51 +00:00
Justin Ruggles
da04be10a2 store exp_strategy for all blocks in decode context
Originally committed as revision 13704 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 22:30:47 +00:00
Justin Ruggles
54624396fc store cpl_in_use for all blocks in decode context
Originally committed as revision 13703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 22:30:43 +00:00
Justin Ruggles
58ce349f0a move the decode context and some macro constants to a new file, ac3dec.h
Originally committed as revision 13697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 22:30:16 +00:00
Justin Ruggles
30f71adc46 move mix level tables from parser to decoder. have parser read bitstream value instead of using an index to a table in the decoder.
Originally committed as revision 13696 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 22:30:09 +00:00
Justin Ruggles
caf0fbc889 add more gain levels and adjust mix level tables accordingly.
Originally committed as revision 13695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 22:30:03 +00:00
Justin Ruggles
687671f03b pass bap table to ff_ac3_bit_alloc_calc_bap()
Originally committed as revision 13694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 22:29:54 +00:00
Justin Ruggles
4921bbbae5 cosmetics: indent
Originally committed as revision 13692 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 22:29:38 +00:00
Justin Ruggles
aa5d6be8df skip unsupported frame types and substream id's
Originally committed as revision 13691 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 22:29:27 +00:00
Justin Ruggles
be5f17b96b read frame type from header info into decode context
Originally committed as revision 13690 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 22:29:19 +00:00
Justin Ruggles
3596aa6fe6 get substreamid from ac3 parser
Originally committed as revision 13689 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 22:29:11 +00:00
Justin Ruggles
6730e9f300 get the number of blocks from the ac3 parser and use in the ac3 decoder.
Originally committed as revision 13688 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-07 22:29:03 +00:00
Justin Ruggles
7af26d14ac return error on frame sync error
Originally committed as revision 13654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-04 00:31:20 +00:00
Justin Ruggles
fb2b88a816 cosmetics: add a comment, remove a comment
Originally committed as revision 13590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 22:12:49 +00:00
Justin Ruggles
9b57545934 simplify
Originally committed as revision 13589 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 22:12:01 +00:00
Justin Ruggles
6e74513a48 set lfe params at frame init instead of in every block
Originally committed as revision 13588 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 21:57:45 +00:00
Justin Ruggles
b85a15fe73 only calculate number of exponent groups when exponents are not reused.
Originally committed as revision 13587 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 21:53:31 +00:00
Justin Ruggles
aa148649a4 cosmetics: remove unneeded braces
Originally committed as revision 13586 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 21:37:28 +00:00
Justin Ruggles
7e13b31c19 10l: cosmetics
Originally committed as revision 13585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 19:59:10 +00:00
Justin Ruggles
e25973a1fd new dba values requires running last 2 bit allocation stages
Originally committed as revision 13584 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 19:56:54 +00:00
Justin Ruggles
ff5d419e2f get_transform_coeffs() never returns an error, so make the function and its children return void.
Originally committed as revision 13582 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 16:04:41 +00:00
Justin Ruggles
fbe52e4188 use enum value for CRC error
Originally committed as revision 13580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 15:31:57 +00:00
Justin Ruggles
c78c6d6c58 move header error logging to after CRC check
Originally committed as revision 13579 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-31 15:30:55 +00:00
Justin Ruggles
bd98e9e230 zero the upper frequencies of the correct coefficients
Originally committed as revision 13452 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-27 00:43:39 +00:00
Justin Ruggles
eccba2bc4b safer solution for setting audio parameters
Originally committed as revision 13402 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 20:02:24 +00:00
Justin Ruggles
cf03a8173a set audio parameters if frame header is ok, even if crc fails
Originally committed as revision 13399 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 18:54:17 +00:00
Justin Ruggles
3336110acf cosmetics: indent
Originally committed as revision 13398 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 18:06:01 +00:00
Justin Ruggles
ecfe94b294 add error concealment
Originally committed as revision 13397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 18:05:15 +00:00
Justin Ruggles
93a2c8c14f cosmetics: indent
Originally committed as revision 13385 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 16:20:06 +00:00
Justin Ruggles
43ad93a4f1 10l: fix error in commit r13382
Originally committed as revision 13384 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 16:19:44 +00:00
Justin Ruggles
82a591d8d1 add checks for missing information in the first block
Originally committed as revision 13382 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 15:34:48 +00:00
Justin Ruggles
3af9131398 add check for invalid channel mode when coupling is used
Originally committed as revision 13381 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-25 15:23:03 +00:00
Diego Biurrun
245976da2a Use full path for #includes from another directory.
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +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
Bartlomiej Wolowiec
55736cfbd2 change ff_ac3_parse_header() to take a GetBitContext instead of const char*
Originally committed as revision 12922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-22 11:14:01 +00:00
Bartlomiej Wolowiec
79b25a27b8 change name from stream type to frame type in AC3 code
Originally committed as revision 12623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-28 20:42:55 +00:00
Justin Ruggles
509fdb0b7e only allocate context input buffer if AVCodecContext.error_reslience is greater than 0.
Originally committed as revision 12600 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-26 22:36:41 +00:00
Justin Ruggles
984ff38a2b cosmetics: indentation after last commit
Originally committed as revision 12594 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-25 23:34:49 +00:00
Justin Ruggles
c33a196716 additional protection from segmentation faults and memory access errors by
copying the input buffer to a local context buffer which is large enough to
hold the largest possible AC3 frame.

Originally committed as revision 12593 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-25 23:34:00 +00:00
Bartlomiej Wolowiec
4e6eeaf019 using stream type in eac3 parser
Originally committed as revision 12570 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-24 21:25:49 +00:00
Zuxy Meng
98a6fff98c Apply 'cold' attribute to init/uninit functions in libavcodec
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 03:11:20 +00:00
Justin Ruggles
98f6dfa653 make input buffer const, as it should be. fixes a warning.
Originally committed as revision 12418 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-10 21:59:30 +00:00
Justin Ruggles
38dae9c3a6 downmix before imdct unless different size transforms are used. about 20%
faster 5.1-to-stereo downmixing.

Originally committed as revision 12397 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-09 17:05:19 +00:00
Justin Ruggles
d8870f120e use scale factor instead of sum for downmix level adjustment. avoids division
inside downmix loop. 7% faster 5.1-to-stereo downmixing.

Originally committed as revision 12287 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-01 16:10:19 +00:00
Justin Ruggles
9d10e6e6c0 pre-calculate downmix coefficient sums. 2% faster 5.1-to-stereo downmixing.
Originally committed as revision 12286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-01 15:48:18 +00:00
Justin Ruggles
a4de6dd2c1 Use 24-bit fixed-point transform coefficients until just before MDCT. This
gives 7% faster decoding on average.

Originally committed as revision 12284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-01 04:39:39 +00:00