generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
21,128 Commits 24 Branches 241 Tags 173 MiB
53bc53ae4e
Commit Graph

10303 Commits

Author SHA1 Message Date
Reimar Döffinger
eb0d04c325 Use ff_put_string in vorbis encoder. 
Originally committed as revision 20095 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-30 10:37:37 +00:00
Reimar Döffinger
003121091e Replace several #ifdef PIC with the more obvious and correct 
#if !HAVE_EBX_AVAILABLE, since all it does is avoid using ebx.

Originally committed as revision 20094 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-30 09:49:12 +00:00
Kostya Shishkov
53f9f9c91b When BitsPerSample tag is not present in TIFF, that means file is 
monochrome, so initialize picture before decoding.
This fixes decoding monochrome files produced by lavc TIFF encoder.

Originally committed as revision 20091 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-30 05:49:18 +00:00
Justin Ruggles
2ed4439658 Simplify stereo rematrixing by only using one temporary variable. It is also 
about 1.8% faster on my system.

Originally committed as revision 20090 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-30 01:25:04 +00:00
Justin Ruggles
16c91d2b23 remove unneeded assignment in inner loop. rematrixing bands are contiguous. 
Originally committed as revision 20089 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-30 01:09:57 +00:00
Reimar Döffinger
8f1e203a56 Use context instead of NULL for logging. 
Originally committed as revision 20085 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 19:18:51 +00:00
Reimar Döffinger
ebb651d5f2 Make sure that dv encoder initializes all encoded packet data. 
The specification does not say which value to use for unused
parts, so fill all unused bytes with 0xff, which is consistent
with what DV usually uses for reserved or unused parts.

Originally committed as revision 20084 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 19:17:18 +00:00
Diego Biurrun
8a8720c1bb cosmetics: K&R coding style, prettyprinting 
Originally committed as revision 20083 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 18:03:30 +00:00
Jason Garrett-Glaser
8ea08becfa Fix indentation in avcodec.h 
Originally committed as revision 20082 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 17:34:36 +00:00
Måns Rullgård
0e71841b05 WMA: fix loop unrolling in decode_exp_vlc() 
The count can be a non-multiple of 4 after all.

Originally committed as revision 20081 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 12:48:24 +00:00
Diego Biurrun
a7adcf29cf whitespace cosmetics, prettyprinting, K&R coding style 
Originally committed as revision 20080 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 11:43:58 +00:00
Reimar Döffinger
badce93dad Simplify r20025: use align_get_bits instead of reimplementing it. 
Originally committed as revision 20079 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 11:06:04 +00:00
Måns Rullgård
076a9dea1e WMA: store level_table as floats, use type punning for sign flip in decode 
Originally committed as revision 20078 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 10:38:34 +00:00
Måns Rullgård
ff00b94e9d WMA: use type punning and unroll loops in decode_exp_vlc() 
GCC does stupid things if these assignments are done using floats
directly, so fill the runs using integer operations instead.  Also
unroll the loops since the length is always a multiple of 4.

Originally committed as revision 20077 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 10:38:30 +00:00
Måns Rullgård
c0d1463da7 WMA: use a table instead of pow() in decode_exp_vlc 
Originally committed as revision 20076 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 10:38:27 +00:00
Kostya Shishkov
a5568f4608 Make sure all the bits are written to output in fax data decoder. 
This fixes decoding TIFF images with fax compression and width being not
multiple of eight (and issue 1429).

Originally committed as revision 20072 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-29 05:55:14 +00:00
Diego Biurrun
0b8e7ab059 some more linebreak and brace placement cosmetics 
Originally committed as revision 20071 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-28 21:46:22 +00:00
Diego Biurrun
5e56b30e1f brace placement and linebreak cosmetics 
Originally committed as revision 20070 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-28 21:13:47 +00:00
Robert Swain
754ff9a795 Refactor channel element configuration and mapping code into its own function 
to allow reuse

Originally committed as revision 20069 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-28 15:37:18 +00:00
Robert Swain
2309923c5c Reindent after last commit 
Originally committed as revision 20068 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-28 15:35:51 +00:00
Robert Swain
e22da6b637 AAC: Add channel layout support for channel configuration as defined in the 
specification

Originally committed as revision 20067 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-28 15:35:13 +00:00
Kostya Shishkov
d2cdf20147 cosmetics: reindent and reformat function declarations 
Originally committed as revision 20066 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-28 05:19:13 +00:00
Kostya Shishkov
8da5d3dc37 Finally distinguish TIFF_CCITT_RLE and TIFF_G3 1-D case, so both of them 
will be decoded correctly.
This fixes issue 1423.

Originally committed as revision 20065 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-28 05:17:20 +00:00
Kostya Shishkov
7c6f5238c6 Make TIFF decoder load compression options only for corresponding codec 
Originally committed as revision 20064 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-28 05:15:27 +00:00
Måns Rullgård
ec71a8e00b ARM: NEON optimised vector_fmul_add 
Originally committed as revision 20063 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 16:52:05 +00:00
Måns Rullgård
35de5d2412 cosmetics: fix indentation after previous commit 
Originally committed as revision 20062 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 16:52:00 +00:00
Måns Rullgård
952e872198 Drop unused args from vector_fmul_add_add, simpify code, and rename 
The src3 and step arguments to vector_fmul_add_add() are always zero
and one, respectively.  This removes these arguments from the function,
simplifies the code accordingly, and renames the function to better
match the new operation.

Originally committed as revision 20061 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 16:51:54 +00:00
Martin Storsjö
eec69b399a Do not compile ZLib data uncompressing function in TIFF decoder when ZLib is 
not present.
Patch by Martin Storsjö
($firstname <at> $firstname <dot> two first letters of $lastname)

Originally committed as revision 20058 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 09:43:11 +00:00
Måns Rullgård
d975e5e9b7 WMAPRO: use vector_fmul_scalar from dsputil where possible 
Originally committed as revision 20056 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 08:16:50 +00:00
Justin Ruggles
8b11b44ea7 Rearrange loop structure for approx. 35-50% faster calc_transform_coeffs_cpl() 
depending on content.

Originally committed as revision 20055 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 07:16:51 +00:00
Kostya Shishkov
e96f885aa0 Looks like ZLib uncompress() cannot deal with some kinds of TIFF deflated data, 
so replace it with custom code.
This fixes issue 1419.

Originally committed as revision 20054 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 07:01:01 +00:00
Justin Ruggles
3b6c5ad2f6 Move variable declaration to inside of loop. 
Originally committed as revision 20053 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 06:38:57 +00:00
Justin Ruggles
025873738f Cosmetics: Rename some variables. 
Originally committed as revision 20052 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 06:38:13 +00:00
Justin Ruggles
b5f4639b13 Simplify coupling band loop. 
Originally committed as revision 20051 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 06:33:23 +00:00
Justin Ruggles
09e03847b9 Remove unneeded table lookup. 
Originally committed as revision 20050 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 06:16:49 +00:00
Justin Ruggles
444ce49a7a Cosmetics: Rename some variables to be more descriptive of their use. 
Originally committed as revision 20049 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 06:13:01 +00:00
Justin Ruggles
4e745ea83e Move some variable declarations to inside of loops. 
Originally committed as revision 20048 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 06:10:36 +00:00
Justin Ruggles
3538a2e47a Remove unneeded variable. 
Originally committed as revision 20047 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 06:01:32 +00:00
Justin Ruggles
84cb4bc6a2 Cosmetics: Rename some variables to be more descriptive of their use. 
Originally committed as revision 20046 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 05:48:03 +00:00
Justin Ruggles
8a547c25a0 Remove some unneeded variables. 
Originally committed as revision 20045 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 05:39:57 +00:00
Justin Ruggles
403b1543b5 Cosmetics: Rename some variables 
Originally committed as revision 20044 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 05:36:52 +00:00
Justin Ruggles
f805d5fc9d simplify 2 lines into 1 using FFMIN 
Originally committed as revision 20043 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 04:57:36 +00:00
Justin Ruggles
612bdf1808 Cosmetics: Do some basic pretty-printing. 
Originally committed as revision 20042 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 04:55:37 +00:00
Justin Ruggles
bf8643838b Simplify by combining increment with array access. 
Originally committed as revision 20041 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 04:47:38 +00:00
Justin Ruggles
89e6317b5b cosmetics: Rename some variables to be more descriptive of their use. Do some 
pretty-printing as well.

Originally committed as revision 20040 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 04:46:56 +00:00
Justin Ruggles
a7e7417c41 Move 2 variable declarations to inside of loop. 
Originally committed as revision 20039 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 04:41:05 +00:00
Justin Ruggles
20520421a1 simplify by combining increment with array access 
Originally committed as revision 20038 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 04:37:00 +00:00
Justin Ruggles
be5830ea7a Remove unneeded variable 
Originally committed as revision 20037 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 04:32:31 +00:00
Justin Ruggles
b05e4195d4 Hardcode AC-3 critical band tables when CONFIG_HARDCODED_TABLES is set. 
Originally committed as revision 20036 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-27 04:07:49 +00:00
Justin Ruggles
65935bc729 simplify format string for writing pix_fmt string. 
Originally committed as revision 20034 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-26 22:54:29 +00:00
Måns Rullgård
f331cec47d ARM: NEON optimised vector_clipf 
Originally committed as revision 20031 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-26 19:55:21 +00:00
Måns Rullgård
0a07e9d012 WMA: remove some unused variables 
Originally committed as revision 20030 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-26 19:23:27 +00:00
Måns Rullgård
b9b1ad9cd8 ARM: NEON optimised vector_fmul_reverse 
Originally committed as revision 20029 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-26 19:23:25 +00:00
Reimar Döffinger
a55247e761 Specify maximum sample rate of MLP by defining the factor relative to 48000 
instead of directly.
This makes clear that the code assumes the maximum sample rate to be
a multiple of 48000 and also removes the division from the MAX_BLOCKSIZE
macros, which causes an issue with the Solaris assembler where "/" is
a comment marker unless the --divide option is used.

Originally committed as revision 20026 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-26 16:04:35 +00:00
Kostya Shishkov
a8c7a3d2c1 Fix decoding of TIFF CCITT RLE compressed data. 
This fixes issue 1417.

Originally committed as revision 20025 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-26 05:48:50 +00:00
Justin Ruggles
84e30ef992 Align pix_fmt list by allowing one more char for the pix_fmt name. 
Originally committed as revision 20024 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-25 01:31:53 +00:00
Reimar Döffinger
ef530829f8 Remove ff_realloc_static, it is no longer used and since it was declared 
static there is no reason to wait for a major version bump, removing
it does not change ABI in any way, not even the non-public one.

Originally committed as revision 20023 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 22:39:47 +00:00
Reimar Döffinger
1e224c5480 Reindent. 
Originally committed as revision 20022 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 22:37:34 +00:00
Reimar Döffinger
e518a49f34 Remove a piece of code left-over from the removed alloc'd static vlc table code. 
Originally committed as revision 20021 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 22:36:52 +00:00
Vitor Sessak
f49bcde63b Reindent code folowing previous commit (r20019) 
Originally committed as revision 20020 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 21:26:35 +00:00
Vitor Sessak
b11d40d12e Factorize duplicated code in at1_imdct_block() 
Originally committed as revision 20019 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 21:24:58 +00:00
Maksym Veremeyenko
fbec307f6c Allow decoding of 625/50 (PAL) with video_stype==1. 
Patch by Maksym Veremeyenko, verem m1stereo tv

Originally committed as revision 20018 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 19:37:41 +00:00
Kostya Shishkov
a58e96be0e Support both LSB and MSB orders for TIFF CCITT G.x compressed data. 
This fixes issue 1410.

Originally committed as revision 20016 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 18:30:28 +00:00
Reimar Döffinger
595324e143 Completely remove INIT_VLC_USE_STATIC, it is deprecated since ages and 
finally no longer used anywhere.

Originally committed as revision 20013 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 15:13:34 +00:00
Reimar Döffinger
80bc3bbc2e Replace last use of INIT_VLC_USE_STATIC by INIT_VLC_USE_NEW_STATIC in svq1dec 
Originally committed as revision 20012 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 15:12:05 +00:00
Reimar Döffinger
2f9bbdd25c Change VLC table creation in x8_vlc_init to use INIT_VLC_USE_NEW_STATIC. 
Originally committed as revision 20011 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 11:04:46 +00:00
Reimar Döffinger
c05df6895f Use ff_msmpeg4_decode_init to initialize ff_msmp4_mb_i_vlc since static 
VLC tables should only be initialized from one place.
This initializes/calculates more VLC tables than necessary for VC1 decoding,
but this is only done once and only a small overhead in time and space (maybe
30 kB) it seems not worth adding a separate function.

Originally committed as revision 20010 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 10:49:47 +00:00
Reimar Döffinger
9c3068c80e Use INIT_VLC_STATIC where easily possible in svq1dec 
Originally committed as revision 20009 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 09:44:51 +00:00
Mike Melanson
0efbd068e7 Make sure that all memory allocations succeed. 
Based on 28_theora_malloc_checks.patch from the Google Chrome team.

Originally committed as revision 20008 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 06:33:16 +00:00
Kostya Shishkov
22da339f5d Take into account real number of colours when reading BMP palette. 
This fixes issue 1408

Originally committed as revision 20007 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-24 05:24:46 +00:00
Reimar Döffinger
c31afa5d24 Fix format string to match the types printed. 
Originally committed as revision 20003 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 15:30:38 +00:00
Michael Niedermayer
2a9b5c9b42 Make sure priv_data is freed and codec is set to NULL in case of failure of avcodec_open(). 
Originally committed as revision 20002 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 15:16:36 +00:00
Google Chrome
aedc98b0a4 Check submap indexes. 
10_vorbis_submap_indexes.patch by chrome.
I am applying this even though Reimar had some comments to improve it as it fixes
a serious security issue and I do not want to leave such things unfixed.

Originally committed as revision 20001 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 14:19:17 +00:00
Måns Rullgård
9bda7f3063 ARM: NEON optimised int32_to_float_fmul_scalar 
Originally committed as revision 20000 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 13:52:56 +00:00
Måns Rullgård
b418a6ca7e AAC: minor simplification in PNS decoding 
Originally committed as revision 19999 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 13:52:53 +00:00
Michael Niedermayer
0a01efd0aa Make error return sign consistent. 
Originally committed as revision 19997 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 13:18:29 +00:00
Google Chrome
36b7e983a6 Check begin/end/partition_size. 
23_vorbis_sane_partition.patch by chrome.
Also this should be better documented but i prefer not to leave potential
security issues open due to missing documentation.

Originally committed as revision 19996 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 13:08:48 +00:00
Google Chrome
310afddfe0 Fix >= vs > check of coded_fragment_list_index. 
22_fix_theora_frag_fencepost.patch by chrome

Originally committed as revision 19995 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 12:42:12 +00:00
Diego Biurrun
75bbed517f Remove unused variables, fixes the warnings: 
libavcodec/wmadec.c:629: warning: unused variable `i'
libavcodec/wmadec.c:628: warning: unused variable `b'
libavcodec/wmadec.c:628: warning: unused variable `a'

Originally committed as revision 19994 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 12:29:56 +00:00
Google Chrome
fa6f27517b Fix init_get_bits() buffer size. 
18_fix_theora_header_bit_len.patch by chrome

Originally committed as revision 19993 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 12:27:10 +00:00
Google Chrome
cdf1512eba Check res_setup->books. 
15_more_residue_book_indexes.patch by chrome.

Originally committed as revision 19992 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 12:24:21 +00:00
Google Chrome
993092dcd3 Check masterbook index and subclass book index. 
14_floor_masterbook_index.patch by chrome

Originally committed as revision 19991 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 12:17:54 +00:00
Google Chrome
e5b0cfb541 Add checks for per-packet mode indexes and per-header mode mapping indexes. 
12_vorbis_mode_indexes.patch by chrome
maybe exploitable

Originally committed as revision 19990 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 12:09:33 +00:00
Google Chrome
79a4258141 Check classbook value. 
11_vorbis_residue_book_index.patch by chrome.

Originally committed as revision 19989 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 12:02:31 +00:00
Michael Niedermayer
45a014d75e Set data_size to 0 to avoid having it uninitialized. 
based on 31_mp3_outlen.patch by chrome.

Originally committed as revision 19988 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 11:44:30 +00:00
Michael Niedermayer
f7304e99d4 Check data_size in decode_frame_mp3on4(). 
Originally committed as revision 19987 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 11:33:44 +00:00
Michael Niedermayer
0d31833d04 check data_size in decode_frame() 
Originally committed as revision 19986 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 11:29:38 +00:00
Google Chrome
96651e790c Fix book_idx check. 
25_vorbis_floor0_index.patch by chrome.

Originally committed as revision 19984 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 10:45:14 +00:00
Google Chrome
d70fa8f131 Sanity checks for magnitude and angle. 
26_vorbis_mag_angle_index.patch by chrome

Originally committed as revision 19983 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 10:40:33 +00:00
Google Chrome
08c8742cdb = -> == typo. 
27_vorbis_residue_loop_error.patch by chrome

Originally committed as revision 19982 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 10:33:49 +00:00
Måns Rullgård
6044538b37 WMA: use DSPContext.butterflies_float 
Originally committed as revision 19981 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 10:33:13 +00:00
Carl Eugen Hoyos
14600807bb Cosmetics: Fix typo. 
Originally committed as revision 19980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 10:07:29 +00:00
Michael Niedermayer
7bf3d0c44e Check num_units_in_tick/time_scale to be valid and within the range we support. 
based on a patch by chrome

Originally committed as revision 19979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 09:58:44 +00:00
Jason Garrett-Glaser
2d3beedee2 Add support for new x264 API. 
Originally committed as revision 19977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 09:03:26 +00:00
Michael Niedermayer
98f7bcb119 Check dimensions against 0 too. 
39_vorbis_zero_dims.patch from chrome

Originally committed as revision 19976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-23 08:35:29 +00:00
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
Kostya Shishkov
6f24cc0b2a Monkey's Audio uses subframes too, declare that in its capabilities 
Originally committed as revision 19883 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 16:18:18 +00:00
Sascha Sommer
d859bb1db0 Add CODEC_CAP_SUBFRAMES for codecs that output multiple subframes 
per AVPacket
No longer print "Multiple frames in a packet" error message
when CODEC_CAP_SUBFRAMES is set (wmapro, wavpack)

Originally committed as revision 19881 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 15:08:26 +00:00
Peter Ross
fa77dd639d perform sanity check on number of audio channels in avcodec_open() 
Originally committed as revision 19877 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 11:29:47 +00:00
Gwenole Beauchesne
385ae7021f Fill in new VASliceParameterBufferMPEG2.slice_horizontal_position field. 
This is needed for the Intel G45 driver.

Originally committed as revision 19876 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 07:50:09 +00:00
Gwenole Beauchesne
25450bb252 Move down HWAccel code path so that to fill in s->mb_x first. 
Originally committed as revision 19875 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2009-09-16 07:49:08 +00:00