Michael Niedermayer
9062cd3544
Check validity of channels & samplerate.
...
This may be security relevant.
Based on 2 patches by chrome.
Originally committed as revision 19975 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-23 07:46:51 +00:00
Mike Melanson
428984b041
Another micro-optimization for unpack_vlcs(): Eliminate a possible
...
branch and save around 45k-55k dezicycles per function run.
Originally committed as revision 19974 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-23 05:38:12 +00:00
Michael Niedermayer
4c0dda2b3f
Check codec_id and codec_type in avcodec_open(), based on 43_codec_type_mismatch.patch from chrome
...
This is said to be able to lead to a stack based buffer overflow.
Originally committed as revision 19973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 22:44:56 +00:00
Måns Rullgård
275cfd1501
ARM: NEON optimised scalarproduct_float
...
Originally committed as revision 19971 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 20:37:55 +00:00
Måns Rullgård
0cb7141282
AAC: 10l: fix PNS decoding
...
Originally committed as revision 19970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 19:31:01 +00:00
Benjamin Larsson
61dc238b45
Hook up the MD studio demuxer and Atrac1 decoder.
...
Originally committed as revision 19969 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 17:28:03 +00:00
Benjamin Larsson
e704b012f2
Mention SDDS so search engines will pick it up for when someone
...
needs to decode the SDDS tracks found on 35 mm movies.
Originally committed as revision 19968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 17:05:19 +00:00
Benjamin Larsson
edd897b1b3
Use ff_sine_32 in atrac1.
...
Originally committed as revision 19967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 17:03:28 +00:00
Mike Melanson
138fe83215
Perform the DC prediction reversal immediately after decoding all of
...
the DC coefficients. This has a greater probability of leveraging the
coefficients while they are still cached.
When testing with the Big Buck Bunny 1080p video, I consistently saw
improvements of 500k-600k dezicycles per run (through
reverse_dc_prediction()) thanks to this move.
Originally committed as revision 19966 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 15:58:08 +00:00
Alex Converse
5419da8d9c
AAC: Simplify some logic from r19956. (The escape codebook is unsigned.)
...
Originally committed as revision 19958 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 01:34:42 +00:00
Måns Rullgård
1dee3e97c6
ARM: NEON optimisations for some dsputil functions
...
NEON versions of the following functions are added:
vector_fmul_scalar
vector_fmul_sv_scalar
sv_fmul_scalar
butterflies_float
Originally committed as revision 19957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 00:48:48 +00:00
Måns Rullgård
42d3fbb3f4
AAC: use new dsputil functions
...
Originally committed as revision 19956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 00:48:45 +00:00
Måns Rullgård
53b572118e
Add some dsputil functions useful for AAC decoder
...
Originally committed as revision 19955 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-22 00:48:41 +00:00
Benjamin Larsson
9caab87829
Add forgotten cleanup function in atrac1.
...
Originally committed as revision 19954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 21:00:18 +00:00
Benjamin Larsson
78b3a12d9c
Cosmetics, indentation.
...
Originally committed as revision 19953 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 20:53:29 +00:00
Benjamin Larsson
a872e5c1f4
Cosmetics. Merge declaration and initialization.
...
Originally committed as revision 19952 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 20:52:24 +00:00
Benjamin Larsson
b6a237025d
Move the scale factor and word length indexes to the stack.
...
Originally committed as revision 19951 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 20:49:08 +00:00
Reimar Döffinger
40e26453c4
Use a custom radix sort implementation instead of qsort in dnxhd encoder.
...
This is mainly to avoid test failures due to implementation-defined
behaviour of qsort when elements are equal, giving different results
for each of FreeBSD, Linux/glibc and Solaris.
In addition it is about 35 % faster, effect on overall speed is minimal
though (< 2%).
Regression tests are unchanged (i.e. identical to Linux/glibc).
Originally committed as revision 19949 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 10:28:31 +00:00
Alex Converse
f5e82fec3d
aacenc: Use preprocessor constants for trellis states and stages.
...
Originally committed as revision 19948 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 04:32:51 +00:00
Alex Converse
9072c29e40
aacenc: Split paths in the scalefactor selection trellis into a 2-D array.
...
Originally committed as revision 19947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 04:15:12 +00:00
Alex Converse
9d4f6f10ae
aacenc: Replace cbrt() with cbrtf() when the result is destined for float
...
storage.
Originally committed as revision 19946 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 03:53:39 +00:00
Alex Converse
0bd9aa449a
aacenc: Multiple distortion by lambda after it's summed and not each individual
...
term before.
Originally committed as revision 19945 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 03:50:59 +00:00
Alex Converse
06d6b962e5
Cosmetics: Reindent after r19943.
...
Originally committed as revision 19944 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 03:42:54 +00:00
Alex Converse
a71e9b6254
aacenc: Don't make unnecessary compares to the escape value in tight loops.
...
Originally committed as revision 19943 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 03:41:08 +00:00
Loren Merritt
1a918c08e4
extend ff_inverse[], and fix its documentation
...
Originally committed as revision 19942 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 03:01:57 +00:00
Måns Rullgård
d650574e68
ARM: merge two loops in ff_mdct_calc_neon
...
Originally committed as revision 19941 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 02:56:12 +00:00
Måns Rullgård
f7a3b6030c
ARM: interleave cos/sin tables for improved NEON MDCT
...
Originally committed as revision 19940 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 02:56:09 +00:00
Måns Rullgård
94274b82f6
Allow arch-specific mdct code to request interleaving of cos/sin tables
...
Originally committed as revision 19939 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 02:56:06 +00:00
Måns Rullgård
3572b281c8
ARM: remove broken IPP support
...
Originally committed as revision 19935 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 01:40:08 +00:00
Mike Melanson
ee3d7f5852
Modify unpack_vlcs() so that there are fewer dereferences through the
...
main (heavily iterated) loop.
Originally committed as revision 19934 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-21 01:37:50 +00:00
Diego Biurrun
40461e54ce
Add parentheses to logical expression to avoid the warning:
...
libavcodec/utils.c:476: warning: suggest parentheses around && within ||
Originally committed as revision 19933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-20 18:29:48 +00:00
Diego Biurrun
a79b4b75f7
Remove unused variable, fixes the warning:
...
libavcodec/atrac3.c:195: warning: unused variable ‘s’
Originally committed as revision 19932 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-20 18:21:54 +00:00
Måns Rullgård
01b2214758
Merge FFTContext and MDCTContext
...
Originally committed as revision 19931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-20 17:30:20 +00:00
Diego Biurrun
ec129499b8
Fix embarassing typo in last commit: Restore mistakenly removed ','.
...
Originally committed as revision 19930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-20 17:18:59 +00:00
Diego Biurrun
1e1898c00f
K&R coding style whitespace cosmetics
...
Originally committed as revision 19929 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-20 17:16:12 +00:00
Carl Eugen Hoyos
7a38c1149c
Cosmetics: Reindent after r19927.
...
Originally committed as revision 19928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-20 14:09:27 +00:00
Martin Fiedler
4410adf12e
Allow encoding frames with more than 2800 lines.
...
Patch by Martin Fiedler, martin fiedler gmx net
Originally committed as revision 19927 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-20 14:08:44 +00:00
Reimar Döffinger
fbc030045c
Support uncompressed 16 bit sgi image format, as e.g. used by the files at
...
http://media.xiph.org/svt/2160p50_CgrLevels_Master_SVTdec05_/1_CrowdRun_2160p50_CgrLevels_MASTER_SVTdec05_/
Originally committed as revision 19926 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-19 11:42:41 +00:00
Reimar Döffinger
bdb156c7b1
Simplify color_flags calculation, remove a pointless initialization
...
and use AV_RB16 where possible.
Originally committed as revision 19925 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-19 11:36:51 +00:00
Reimar Döffinger
75fe5b5243
Make default_correlation array const since it is never modified.
...
Originally committed as revision 19924 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-19 11:35:55 +00:00
Justin Ruggles
306a1204ff
Update AC-3 channel map. 2F/2R layout only has 4 channels. This correction
...
does not change any current channel mapping behavior.
Originally committed as revision 19919 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-19 04:56:22 +00:00
Benjamin Larsson
803d8488f2
Align sample output buffer in atrac1.
...
Originally committed as revision 19918 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-19 01:46:03 +00:00
Benjamin Larsson
0105f49792
Fix the short block transform for atrac1.
...
Originally committed as revision 19917 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-19 01:45:00 +00:00
Diego Biurrun
d773d85515
Reorder functions so that encoding functions are disabled by the preprocessor.
...
Fixes compilation with disabled optimizations and enabled Snow decoder.
Originally committed as revision 19914 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-18 19:45:09 +00:00
Diego Biurrun
27666c3176
Add missing stdint.h #include to fix 'make checkheaders'.
...
Originally committed as revision 19913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-18 19:41:23 +00:00
Baptiste Coudurier
301a24de52
fix uninitialized memory in dnxhd encoder
...
Originally committed as revision 19912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-18 19:03:05 +00:00
Benjamin Larsson
10634c037a
Only use one mdct window size in atrac1.
...
Originally committed as revision 19900 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-17 18:52:11 +00:00
Kostya Shishkov
c4396c241c
Remove useless code causing crash in Targa decoder
...
Originally committed as revision 19892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-17 05:01:27 +00:00
Justin Ruggles
78a9a77eac
add CODEC_CAP_SUBFRAMES to the FLAC decoder capabilities. also add a FIXME
...
comment as a reminder that we can remove both capabilities once a parser is
implemented.
Originally committed as revision 19891 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 22:57:00 +00:00
Måns Rullgård
d25130eb23
ARM: do not use movw/movt for relocatable values with PIC
...
Originally committed as revision 19886 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-16 19:20:48 +00:00