Commit Graph

7566 Commits

Author SHA1 Message Date
Robert Swain
fbd91d7cad Work around GCC variable may be used uninitialised warning
Originally committed as revision 14881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 12:12:03 +00:00
Robert Swain
1098e8d236 Remove unused variable
Originally committed as revision 14880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 11:29:28 +00:00
Diego Biurrun
8e84913db4 cosmetics: Fix incorrect indentation.
Originally committed as revision 14878 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 10:31:08 +00:00
Robert Swain
4b0044b750 Reindent
Originally committed as revision 14877 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 10:23:55 +00:00
Andreas Öman
f339908843 The comment about channel order for AAC 5.1 audio was not correct, fix it.
Originally committed as revision 14875 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 07:57:51 +00:00
Robert Swain
7d8f3de4a8 Last hunk of the AAC decoder code to be OKed and build system and documentation
alterations as appropriate

Originally committed as revision 14873 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 07:21:26 +00:00
Michael Niedermayer
79de84f263 Provide a simpler way for the user to reorder her timestamps.
Originally committed as revision 14871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 23:11:26 +00:00
Diego Biurrun
071083b4a5 Rename ff_init_vlcs function to the more descriptive name ff_mpeg12_init_vlcs.
Now that it is exported, this should avoid confusion and name clashes.

Originally committed as revision 14867 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 17:05:14 +00:00
Diego Biurrun
054480a57b cosmetics: comment spelling/grammar fixes
Originally committed as revision 14866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 16:59:26 +00:00
Peter Ross
2cd04cf919 Fix PCM DVD divide by zero bug introduced in r14659. Patch supplied by lars dot taeuber at gmx dot net.
Originally committed as revision 14864 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-20 11:05:15 +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
Diego Biurrun
0da49fca79 Untangle mpeg12.c and mdec.c so that mdec.c can be compiled separately.
Originally committed as revision 14851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 20:52:26 +00:00
Mathieu Malaterre
7942269b71 cosmetics: s/const static/static const/g
patch by Mathieu Malaterre, mathieu.malaterre gmail com

Originally committed as revision 14850 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 20:04:46 +00:00
Jai Menon
833e90ddf5 Update changelog and general.texi to reflect
addition of the alac encoder, add Jai Menon
to MAINTAINERS and bump LIBAVCODEC_VERSION_MINOR.

Originally committed as revision 14849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 19:25:00 +00:00
Jai Menon
a1ab56c5a8 alacenc: compare against ALAC_MAX_LPC_ORDER instead of MAX_LPC_ORDER
Originally committed as revision 14847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 18:45:00 +00:00
Jai Menon
e13894e80e alacenc: last few hunks approved by michael
Originally committed as revision 14845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 17:20:41 +00:00
Ramiro Polla
cc940caf4d alacenc: Use user-specified min and max prediction order.
Originally committed as revision 14844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:12:05 +00:00
Ramiro Polla
0d962ecb70 Import more OKed parts of ALAC encoder from GSoC repo.
Originally committed as revision 14843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:07:58 +00:00
Roman Shaposhnik
c89cb5894e Making block size in bits variable and dependent on the DV spec
Originally committed as revision 14842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:02:43 +00:00
Roman Shaposhnik
713c1aa9a6 Making the number of blocks per macroblock dependent on the DV stream
specification

Originally committed as revision 14841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:01:41 +00:00
Roman Shaposhnik
cb879ec2fb Introducing DV_MAX_BPM macro instead of a hardcoded value for the
highest number of blocks per macroblock

Originally committed as revision 14840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 16:00:26 +00:00
Peter Ross
143a5d6f1f Add F64BE, F64LE and F64BE PCM codecs.
Originally committed as revision 14833 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 10:43:47 +00:00
Peter Ross
e06b00f3b6 Add SAMPLE_FMT_DBL.
Originally committed as revision 14832 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 10:36:30 +00:00
Peter Ross
4efbd75583 Fix PCM_S16LE_PLANAR channel-address calculation bug introduced in r14659.
Originally committed as revision 14831 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 10:17:29 +00:00
Diego Biurrun
6ec87fbd92 Mark init_vlcs function as av_cold.
Originally committed as revision 14830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-19 08:55:40 +00:00
Robert Swain
1dece0d2cd More OKed AAC decoder code hunks
Originally committed as revision 14829 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 21:36:58 +00:00
Robert Swain
c7f4d983a4 More OKed AAC decoder code hunks
Originally committed as revision 14828 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 19:39:08 +00:00
Peter Ross
97ceb75218 Mark SAMPLE_FMT_S24 as deprecated.
Originally committed as revision 14823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 12:03:59 +00:00
Kostya Shishkov
bf689db069 Add okayed chunks of AAC encoder psychoacoustic model
Originally committed as revision 14822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 05:39:44 +00:00
Kostya Shishkov
b54bf2d6eb Add okayed parts for AAC encoder
Originally committed as revision 14821 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-18 05:38:26 +00:00
Ramiro Polla
ca04826627 Import more ok'd parts of ALAC encoder from GSoC repo.
Originally committed as revision 14820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 22:47:40 +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
Diego Biurrun
ee8cc834ae Add missing header includes to fix 'make checkheaders'.
Originally committed as revision 14817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 19:26:13 +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
Diego Biurrun
defa0cd6f5 Mark adx_decode_init() as type int instead of void, the function returns
a value.  Fixes the warning:
adxdec.c:36: warning: 'return' with a value, in function returning void

Originally committed as revision 14814 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 17:08:25 +00:00
Justin Ruggles
f1f373c220 fix and simplify frame size check and reencoding in verbatim mode
Originally committed as revision 14811 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 16:10:46 +00:00
Ramiro Polla
83e92ab6b8 alacenc: NULL_IF_CONFIG_SMALL long_name.
Originally committed as revision 14801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 12:25:01 +00:00
Vladimir Voroshilov
5209846850 G.729 decoder main code
(just skeleton, contains only parts, explicitly ok'ed by Michael)

Originally committed as revision 14800 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 08:43:37 +00:00
Kostya Shishkov
720d52c678 More okayed chunks of AAC encoder
Originally committed as revision 14799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 07:04:11 +00:00
Ramiro Polla
6b93147684 Import ok'd parts of ALAC encoder from GSoC repo.
Originally committed as revision 14798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-17 04:36:06 +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
Justin Ruggles
81fc8a63c5 use range of lpc orders in ORDER_METHOD_EST
Originally committed as revision 14796 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 21:39:09 +00:00
Justin Ruggles
9045f5e72d cosmetics: adjust line breaks and vertical alignment
Originally committed as revision 14795 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 21:32:03 +00:00
Justin Ruggles
56c07e2989 use limited range of lpc orders when quantizing coefficients
Originally committed as revision 14794 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 21:24:06 +00:00
Ramiro Polla
e9e3c9801e lpc: cosmetics: vertically align declarations and definitions.
Originally committed as revision 14792 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 17:28:29 +00:00
Ramiro Polla
c50da3ad6c flacenc, lpc: Move LPC code from flacenc.c to new lpc.[ch] files.
Originally committed as revision 14790 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 17:18:20 +00:00
Ramiro Polla
51c796d012 flacenc: Allow more flexible shift calculation in LPC.
Originally committed as revision 14789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 17:03:57 +00:00
Michael Niedermayer
3cffbe090a Fix rc_eq mem leak.
Originally committed as revision 14788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 14:46:31 +00:00
Michael Niedermayer
847d05360b Revert r14260
Log:
	Free in avcodec_close() avctx->rc_eq. Fix a memory leak.

Reason running free() on random pointers.

Originally committed as revision 14787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 14:13:49 +00:00
Kostya Shishkov
f5c3eae3cb Synchronize AAC encoder with renamings in aac.h
Originally committed as revision 14786 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 11:59:36 +00:00
Kostya Shishkov
817015e4e2 Add approved chunks to AAC encoder
Originally committed as revision 14785 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 05:47:18 +00:00
Peter Ross
38a1c7f2be Use memcpy() for PCM S16/S32 codecs when codec byte-order matches machine byte-order.
Originally committed as revision 14784 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-16 01:25:12 +00:00
Robert Swain
cce540c5e7 Don't try to free shared ff_sine_* tables pointed to by s->windows[]
Originally committed as revision 14775 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 10:31:11 +00:00
Robert Swain
9ffd5c1cee More OKed AAC decoder hunks
Originally committed as revision 14774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 08:01:31 +00:00
Robert Swain
848a5815ce Synchronise AAC decoder code with that from SoC
Originally committed as revision 14772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 00:19:14 +00:00
Loren Merritt
2272e04aa7 document some dsp alignments
Originally committed as revision 14771 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 00:14:07 +00:00
Robert Swain
62a57fae59 More OKed sections of AAC decoder code
Originally committed as revision 14770 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-15 00:05:09 +00:00
Robert Swain
47698b83fd The ff_sine_#[] should be aligned as they will commonly be used in dsputil
functions

Originally committed as revision 14767 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 22:12:19 +00:00
Aurelien Jacobs
7246177d80 ensure we get explicit definition of various _XOPEN_SOURCE functions we use
Originally committed as revision 14766 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 22:01:59 +00:00
Ramiro Polla
1e8bd10c57 mlp: Define End-of-Stream code in common header file and use it in decoder.
Originally committed as revision 14763 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 19:38:39 +00:00
Kostya Shishkov
07be55dc8b Remove not OKed parts from AAC encoder
Originally committed as revision 14762 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 16:07:17 +00:00
Robert Swain
69fc4da360 Add declarations for the sine tables used in wma.c (half window sizes: 128,
256, 512, 1024 and 2048) to mdct.c. Make them accessible via dsputil.h. Make
wma.c use these shared tables.

Originally committed as revision 14758 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 14:40:16 +00:00
Robert Swain
ece6b83c3e Change wma.c to use the ff_sine_window_init() from mdct.c
Originally committed as revision 14757 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 14:36:22 +00:00
Kostya Shishkov
c03d9d058b Okayed parts of AAC encoder
Originally committed as revision 14752 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 05:52:29 +00:00
Loren Merritt
7ca7d5fae0 file which should have been added in r14749
Originally committed as revision 14751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 05:00:25 +00:00
Loren Merritt
75ac287517 missing prototype
Originally committed as revision 14750 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 04:41:02 +00:00
Loren Merritt
ebceaa1cd5 gcc chokes on the 7 registers needed for float_to_int16_interleave6 (even inside HAVE_7REGS), so write it in yasm
Originally committed as revision 14749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 04:40:46 +00:00
Loren Merritt
ee46753739 gcc chokes on xmm constraints, so pessimize int32_to_float_fmul_scalar_sse a little
Originally committed as revision 14748 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 04:39:59 +00:00
Ramiro Polla
a7cc783d71 mlp: split simple inline function that xors 4 bytes into one.
Originally committed as revision 14747 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-14 03:58:05 +00:00
Loren Merritt
675872382f special case 6 channel version of float_to_int16_interleave
5% faster ac3

Originally committed as revision 14744 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 23:36:37 +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
Ramiro Polla
06cddea060 mlp: Cosmetics: Close comments in an extra line and
remove empty lines between doxy comments and function declarations.

Originally committed as revision 14735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 19:43:18 +00:00
Ramiro Polla
ce15710f55 mlp: Split common code from parser and decoder to be used by encoder.
Originally committed as revision 14733 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 18:47:03 +00:00
Diego Biurrun
e7327dbba7 Remove unused variable.
Originally committed as revision 14732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 18:33:25 +00:00
Ramiro Polla
ee5b34d56e mlp_parser: Initialize crc data in its own function.
Originally committed as revision 14722 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 02:44:38 +00:00
Ramiro Polla
5dae0dd22c mlpdec: Put some doxy comments to the right of vars instead of interleaved.
Originally committed as revision 14721 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 01:41:06 +00:00
Ramiro Polla
f53acb7b17 mlpdec: Split channel parameters from context into their own struct.
Originally committed as revision 14720 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-13 01:36:01 +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
Ramiro Polla
db01fa131b mlpdec: whitespace and line-breaking cosmetics.
Originally committed as revision 14717 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 18:05:58 +00:00
Ramiro Polla
d6aa052dc5 mlpdec: Split filter parameters from context into their own struct.
Originally committed as revision 14716 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 17:53:59 +00:00
Peter Ross
3b4b113781 Fix CODEC_ID_PCM_U8 decoder output size calculation to support odd-number of samples.
Originally committed as revision 14712 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 12:32:40 +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
862b98d42c cosmetics in dsp init
Originally committed as revision 14704 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:51:45 +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
Loren Merritt
e8dd7b0c9a remove a float->double->float conversion.
1.8x faster imdct_c with fpmath=sse, no change with x87

Originally committed as revision 14701 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:34:08 +00:00
Loren Merritt
46803f4f67 optimize imdct_half:
remove tmp buffer.
skip fft reinterleave pass, leaving data in a format more convenient for simd.
merge post-rotate with post-reorder.

Originally committed as revision 14700 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:33:34 +00:00
Loren Merritt
49c0dd754c indent
Originally committed as revision 14699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:27:21 +00:00
Loren Merritt
5d0ddd1a9f split-radix FFT
c is 1.9x faster than previous c (on various x86 cpus), sse is 1.6x faster than previous sse.

Originally committed as revision 14698 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:26:58 +00:00
Loren Merritt
bafad220a7 import yasm macros from x264
Originally committed as revision 14697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-11 23:54:09 +00:00
Robert Swain
9edae4ad81 Synchronise code with AAC decoder in SoC
Originally committed as revision 14695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-11 11:22:48 +00:00
Robert Swain
9cc04edff9 More OKed hunks of the AAC decoder from SoC
Originally committed as revision 14694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-11 11:16:06 +00:00
Roman Shaposhnik
3f66d16821 Fixing the units in DV50 tables (both coordinates are
supposed to be in units of 8 pixels) and simplifying
the calculations of y_ptr and c_offset.

Originally committed as revision 14693 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-11 10:14:46 +00:00