generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
23,089 Commits 24 Branches 241 Tags 173 MiB
7a095ea6fb
Commit Graph

11229 Commits

Author SHA1 Message Date
Kostya Shishkov
54d4c0de7c Move plane decoding code into separate function in Bink decoder 
Originally committed as revision 21980 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 07:00:46 +00:00
Kostya Shishkov
ba3e821414 Bink video decoder now can use extradata to detect alpha plane presence 
Originally committed as revision 21979 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 06:39:23 +00:00
Måns Rullgård
2fc492d842 Declare indeo VLC table storage with correct type 
Originally committed as revision 21977 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 03:45:51 +00:00
Michael Niedermayer
db8cb47d15 Try to set has_b_frames in codec init if we know everything alraedy. 
This fixes some issues with the first few timestamps.

Originally committed as revision 21976 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 01:08:54 +00:00
Michael Niedermayer
9855b2e3c8 Move extradata reading code into codec init instead of doing it 
in read frame.

Originally committed as revision 21975 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-23 01:07:39 +00:00
Kostya Shishkov
1d6065ad08 Make Bink decoder able to skip alpha plane 
Originally committed as revision 21963 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 14:59:51 +00:00
Kostya Shishkov
9068f36dcc Macroblock and block Huffman code sets are to be used by both Indeo 4 and 
Indeo 5, so make them global and move their initialization to the common place
as well. And fix static VLC initialization, as ff_ivi_create_huff_from_desc()
used old way to do so.

Originally committed as revision 21962 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 13:51:32 +00:00
Kostya Shishkov
bb29fee3a6 Make Bink decoder to stop decoding planes after all bits are used. 
This prevents crashes during decoding grayscale Bink files like
samples from Impossible Creatures game demo.

Originally committed as revision 21961 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 12:35:12 +00:00
Kostya Shishkov
fb030bd046 Correct bundle lengths calculation for small Bink files. 
This fixes issue 1764.

Originally committed as revision 21959 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 12:20:49 +00:00
Kostya Shishkov
9b3c455c50 ARM: NEON scalarproduct_int16 and scalarproduct_and_madd_int16 
Patch by Kostya, minor fixes by me.

Originally committed as revision 21958 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 12:20:31 +00:00
Carl Eugen Hoyos
f51674ff5d Fix compilation for --enable-version3 --enable-libopencore_amrwb (only). 
Originally committed as revision 21956 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 09:47:12 +00:00
Måns Rullgård
a87b2f6df4 ARM: add missing preserve8 directives 
Originally committed as revision 21952 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-22 00:34:05 +00:00
Måns Rullgård
39261cd8d9 get/show_bits() can read up to MIN_CACHE_BITS bits 
The limit for get/show_bits_long() to use get/show_bits() directly
should be MIN_CACHE_BITS, not 17.

Originally committed as revision 21951 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 23:28:24 +00:00
Michael Niedermayer
acbb378d1d Fix timestamp association for mpeg2 field pictures. 
Fixes /MPlayer/incoming/codec_copy_fails_vob_to_mpeg-ts/codec_copy_fails_vob_to_mpeg-ts.vob

Originally committed as revision 21949 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 23:22:51 +00:00
Måns Rullgård
7cd7d19e86 Deobfuscate LE SHOW_[SU]BITS; these are simple sign/zero-extend 
Originally committed as revision 21948 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 21:48:40 +00:00
Måns Rullgård
48960b8f24 Add zero_extend() function 
Originally committed as revision 21947 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 21:48:37 +00:00
avcoder
0cb17649d8 Remove unused variable mb_xy. 
Patch by avcoder, ffmpeg gmail

Originally committed as revision 21945 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 19:32:47 +00:00
Vitor Sessak
4fe3edaadf AMR-NB floating-point based decoder. 
Code produced during SoC by Robert Swain and Colin McQuillan.

Originally committed as revision 21943 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 18:01:56 +00:00
Diego Biurrun
dd3475682e Remove unused variable, fixes warnings of the type: 
libavcodec/h264.h:816: warning: unused variable `mb_xy'

Originally committed as revision 21941 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 15:29:17 +00:00
Måns Rullgård
769c497565 indent 
Originally committed as revision 21940 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 15:11:59 +00:00
Måns Rullgård
4c4e746566 Avoid negative shifts in build_table() 
A shift by a negative amount has undefined behaviour.  Even though
the result of this shift is never used, the shift itself could
cause an exception of some kind.

Originally committed as revision 21939 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 15:11:57 +00:00
Kostya Shishkov
342c7dfdbb Bink video decoder 
Originally committed as revision 21937 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 13:28:46 +00:00
Måns Rullgård
d68b27a95d VC1: fix missing include h263.h 
Originally committed as revision 21932 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 02:46:44 +00:00
David Conrad
6cb35b45e6 Simplify determing whether fragments are coded 
No measurable speed difference

Originally committed as revision 21931 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 00:11:01 +00:00
David Conrad
a89264761f Handle Theora's continued runs in superblock coding. 
This doesn't really matter yet since 4:2:0 1080p has only 3060 superblocks,
but larger resolutions or 4:4:4 1080p could hit this case.

Originally committed as revision 21930 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 00:10:58 +00:00
David Conrad
855c720c86 Decode fully coded superblocks in the same manner as partial superblocks and qpi 
No speed difference, but it will simplify the special 4129 case.

Originally committed as revision 21929 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 00:10:54 +00:00
David Conrad
ecb51b25bb Make the special 4129 case for long-run bit strings a #define and explain it 
Originally committed as revision 21928 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 00:10:51 +00:00
David Conrad
33dbc1b7ca Use memset to set the runs partially coded superblocks 
Much faster for long runs (e.g. nearly uncoded frames), slightly faster
for the general case.

Originally committed as revision 21927 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-21 00:10:47 +00:00
Måns Rullgård
e4a35244fa Replace log2f(10) with a constant 
Originally committed as revision 21924 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-20 20:13:48 +00:00
Vitor Sessak
c4f267ab75 Free encoder extradata in avcodec_close(). Should fix several small memory 
leaks when encoding (at least for asv, wma and aac).

Fix also issue 1577.

Originally committed as revision 21923 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-20 18:28:11 +00:00
Ramiro Polla
da2a5feaea x86_fft.o depends on MMX and FFT. 
Originally committed as revision 21921 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-20 15:39:27 +00:00
Stefan Gehrer
cbdcf479ce remove tables of codebook vector values which are contained in 
another table

Originally committed as revision 21918 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-20 12:32:30 +00:00
Kostya Shishkov
4689ac41e9 16l trocadero: don't forget to free frame data buffer in APE decoder 
Originally committed as revision 21910 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 22:23:55 +00:00
Daniel Verkamp
7fa78f49f0 msmpeg4v* encoders depend on h263dec 
Originally committed as revision 21907 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 21:34:50 +00:00
Daniel Verkamp
8e25a3d637 Declare WMV1 decoder dependencies 
Originally committed as revision 21906 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 21:21:04 +00:00
Daniel Verkamp
77ce6653d2 Declare CAF demuxer dependency on mpegaudio 
Originally committed as revision 21904 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 21:07:46 +00:00
Daniel Verkamp
e0ae359115 Fix compilation of binkaudio_rdft when dct is disabled 
Originally committed as revision 21903 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 20:51:12 +00:00
Stefan Gehrer
3a201bd04f remove a Huffman table from WMA which also exists in AAC 
Originally committed as revision 21902 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 20:42:55 +00:00
Vitor Sessak
f1c8e5aa94 Add missing dependency of TwinVQ 
Originally committed as revision 21898 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 17:23:00 +00:00
Stefan Gehrer
cc01ab903e remove ivi5_scans8x8[0], it duplicates ff_zigzag_direct 
Originally committed as revision 21897 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 17:17:20 +00:00
Kostya Shishkov
aa170ed625 cosmetics: reindent after last commit 
Originally committed as revision 21895 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 14:06:12 +00:00
Kostya Shishkov
965828bb66 Since WavPack chunk can contain more samples than FFmpeg is guaranteed to 
hold, decode it in several iterations outputting as many samples as possible.

Originally committed as revision 21894 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 14:05:41 +00:00
Thilo Borgmann
245d5a48ef Add the dependency for mpeg4audio.o of the ALS decoder. 
Originally committed as revision 21893 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 08:26:35 +00:00
Thilo Borgmann
a8c09ff2d8 Do sequential bit reading outside of []-operators. 
Originally committed as revision 21892 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 08:07:02 +00:00
Michael Niedermayer
f4ce853125 get rid of an if() 1 cpu cycle faster. 
Originally committed as revision 21889 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 03:10:26 +00:00
Michael Niedermayer
e69bfde6b2 Get rid of a local variable, 10 cpu cycles faster. 
Originally committed as revision 21888 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-19 02:37:11 +00:00
Michael Niedermayer
a305449df6 Move abs() from decode_cabac_mb_mvd() to the code that writes mvd_cache. 
4-8 cycles faster

Originally committed as revision 21887 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-18 23:37:48 +00:00
Alex Converse
8d63712486 Add some AAC buffer overread checks. 
Originally committed as revision 21886 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-18 23:06:56 +00:00
Stefan Gehrer
3cc3581dc0 fix intra prediction modes with inter-MB neighbors, 
the old sample clips are in violation of the 2006 spec

Originally committed as revision 21883 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-18 18:23:48 +00:00
Måns Rullgård
19769ece3b H264: use alias-safe macros 
This eliminates all aliasing violation warnings in h264 code.
No measurable speed difference with gcc-4.4.3 on i7.

Originally committed as revision 21881 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-18 16:24:31 +00:00
Michael Niedermayer
024bf79fe0 Simplify deblock_left/top condition for deblocking_filter=2 
Originally committed as revision 21876 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-18 12:37:43 +00:00
Michael Niedermayer
90a5849efd Speedup decode_cabac_field_decoding_flag() by 9 cpu cycles. 
Originally committed as revision 21875 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-18 12:13:21 +00:00
Måns Rullgård
5e46be96f8 Move NEG_[US]SR32 macros to mathops.h 
Originally committed as revision 21873 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 23:58:59 +00:00
Thilo Borgmann
dc9e57a878 Fix sizeof()-statement to use the actual pointer type. 
Originally committed as revision 21872 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 23:26:48 +00:00
Thilo Borgmann
cd09284924 Fix wrong buffer allocation for MCC in ALS. 
Originally committed as revision 21871 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 22:53:25 +00:00
Alex Converse
fd10543ef2 get_bits: Fix spelling and grammar in GET_VLC() comment. 
Originally committed as revision 21868 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 21:20:43 +00:00
Måns Rullgård
1e2245c29b 10l: remove stray '(' I don't know where it came from 
Originally committed as revision 21867 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 21:04:56 +00:00
Måns Rullgård
40d1122752 Use LOCAL_ALIGNED macro for local arrays 
Originally committed as revision 21866 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 20:36:20 +00:00
Måns Rullgård
d96cd42969 Add LOCAL_ALIGNED() macro for declaring aligned local arrays 
Originally committed as revision 21864 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 20:36:12 +00:00
Måns Rullgård
2480c390bd Simplify some declarations of aligned arrays 
If DECLARE_ALIGNED_16 works on uint64_t it will work smaller types too.

Originally committed as revision 21863 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 20:36:10 +00:00
Michael Niedermayer
69a28f3e2b Move predict_field_decoding_flag() from h264.h to .c as its only used there and belongs 
there as well.

Originally committed as revision 21861 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 02:25:05 +00:00
Michael Niedermayer
69cc31832f Move check for and call of predict_field_decoding_flag() from the mb code to 
the row code. This function would only be needed on a MB basis for MBAFF+FMO

Originally committed as revision 21860 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-17 02:14:02 +00:00
Michael Niedermayer
59f733d1b1 2x faster ff_h264_init_cabac_states(), 4k cpu cycles less. 
Sadly this is just per slice so the speedup with normal files should be negligible.

Originally committed as revision 21859 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 23:43:08 +00:00
Thilo Borgmann
114315994b Limit the Rice parameter used for progressive decoding in ALS. 
Originally committed as revision 21849 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 14:48:01 +00:00
James Darnley
85207e38dc Add lsp.o as a dependency for wmavoice. This fixes a compilation error when 
you disable lots of stuff (in particular other voice codecs) but leave
wmavoice enabled.

Patch by James Darnley <$firstname dot $lastname at gmail dot com>.

Originally committed as revision 21848 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 14:33:13 +00:00
Peter Ross
cbba8fec23 Support <8-bit ILBM uncompressed bitmaps 
Originally committed as revision 21846 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 09:33:59 +00:00
Michael Niedermayer
37a9719a97 2 cpu cycles faster context calculation for decode_cabac_intra_mb_type() 
Originally committed as revision 21845 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 02:51:37 +00:00
Michael Niedermayer
5806e8cd1f Drop a few redundant slice_num checks. 
Originally committed as revision 21844 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 00:09:30 +00:00
Michael Niedermayer
053074276b Drop compute_mb_neighbors() and move fill_decode_neighbors() up to take its 
role.
Should be faster as this is a strict code removial.

Originally committed as revision 21843 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 23:04:07 +00:00
Michael Niedermayer
c1bb66ac19 Split setting neighboring MBs from fill_decode_caches() 
no speed change.

Originally committed as revision 21842 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 22:07:02 +00:00
Michael Niedermayer
cf55f59d5e Simplify decode_cabac_mb_intra4x4_pred_mode(). 
same speed

Originally committed as revision 21839 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 19:22:09 +00:00
Michael Niedermayer
f4060611e9 Merge decode_cabac_mb_type_b() into calling code. 
This avoids a conditional branch and is about 3 cpu cyclues faster.

Originally committed as revision 21838 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 19:20:49 +00:00
Maxim Poliakovski
6713b6b120 Remove outdated comment. 
Patch by Maxim, max_pole gmx de

Originally committed as revision 21837 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 17:37:38 +00:00
Stefan Gehrer
35122bd93e add heuristic to discern the old sample clips from streams encoded 
with rm52j encoder, a marker_bit has been added in the I-Frame syntax

Originally committed as revision 21836 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 16:43:45 +00:00
Stefan Gehrer
026b9d3c5a avoid using DECLARE_ALIGNED on stack variable as suggested by Reimar 
Originally committed as revision 21835 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 16:37:13 +00:00
Alex Converse
8958445898 AAC: Mark che_configure() as av_cold. 
It is also only called when the output configuration is not locked.

Originally committed as revision 21834 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 16:29:46 +00:00
Alex Converse
ff98c17cba AAC: Mark functions that are only called when the output configuration is not locked as av_cold. 
Originally committed as revision 21833 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 16:19:46 +00:00
Peter Ross
005caa3486 IFF bitmap n-bit color support 
Originally committed as revision 21831 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 11:26:35 +00:00
Michael Niedermayer
24006f59cb 10l ;; gcc 2.95 compilation fix by mike 
Originally committed as revision 21830 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 09:11:00 +00:00
Michael Niedermayer
cbfcde9f52 10l use pack16to32(), should fix big endian h264 failures. 
Originally committed as revision 21829 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 01:24:50 +00:00
Michael Niedermayer
64dd1b0a1d Merge the single line function decode_cabac_mb_transform_size() 
into the calling code.
8 cpu cycles faster

Originally committed as revision 21828 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 01:04:07 +00:00
Michael Niedermayer
8b38d10761 indent 
Originally committed as revision 21827 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 23:10:02 +00:00
Michael Niedermayer
f4b8b82514 Merge decode_cabac_mb_dqp() with surronding code. 
~20 cpu cycles faster

Originally committed as revision 21826 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 23:06:25 +00:00
Michael Niedermayer
94cb599443 Drop if(0) code. 
Originally committed as revision 21825 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 22:59:19 +00:00
Michael Niedermayer
a59b9ee33d Set sub_mb_type in direct_cache instead of just the direct flag. 
Simpler, cleaner and faster.

Originally committed as revision 21822 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 16:51:31 +00:00
Michael Niedermayer
2dc380ca8e Store sub_mb_type in direct_cache/direct_table. 
This is equal complexity but could be more usefull.

Originally committed as revision 21821 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 14:41:27 +00:00
Michael Niedermayer
3d2c3ef4b4 Remove slice_table checks from decode_cabac_mb_cbp_luma() and set left/top_cbp so 
these checks arent needed.

Originally committed as revision 21819 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 02:08:48 +00:00
Michael Niedermayer
056c502155 Revert r21814 
Log:
	h264: Fix pointer warnings by removing redundant [0]

	Fixes:
	h264.h:1222:38: warning: initialization from incompatible pointer type
	h264.h:1299:38: warning: initialization from incompatible pointer type
	h264.h:1314:42: warning: initialization from incompatible pointer type

Reason: breaks h264 decoding & fate

Originally committed as revision 21818 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 02:04:41 +00:00
Michael Niedermayer
6e7c397b5c Cosmetics, vertical align. 
Originally committed as revision 21817 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 01:14:05 +00:00
Michael Niedermayer
e916764675 Direct temporal skiped MBs dont need fill_decode_caches() at all so dont call it 
for them.

Originally committed as revision 21816 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 22:53:44 +00:00
Alexander Strange
78998bf217 h264: Remove unused variables. 
Originally committed as revision 21815 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 21:09:38 +00:00
Alexander Strange
677dab59cb h264: Fix pointer warnings by removing redundant [0] 
Fixes:
h264.h:1222:38: warning: initialization from incompatible pointer type
h264.h:1299:38: warning: initialization from incompatible pointer type
h264.h:1314:42: warning: initialization from incompatible pointer type

Originally committed as revision 21814 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 21:08:17 +00:00
Alexander Strange
cd12c37729 Fix integer overflow warnings in h264.h 
Fixes:
h264.h: In function 'fill_filter_caches':
h264.h:1216:73: warning: integer overflow in expression
h264.h:1307:81: warning: integer overflow in expression

Originally committed as revision 21813 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 20:57:13 +00:00
Michael Niedermayer
bb770c5b52 Merge (IS_SKIP(mb_type) || IS_DIRECT(mb_type) 
Originally committed as revision 21812 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 20:13:54 +00:00
Michael Niedermayer
2e4362af14 Skiped MBs dont need the cbp stuff so skip initing that. 
Originally committed as revision 21811 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 20:13:10 +00:00
Thilo Borgmann
65760304bc Reindent a line. 
Originally committed as revision 21810 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 19:59:53 +00:00
Michael Niedermayer
e2b28acf89 Also skip direct/mvd_cache init for skiped blocks. 
Odd thing is i thought ive tryed this already and it failed previously.

Originally committed as revision 21809 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 19:39:18 +00:00
Michael Niedermayer
cb9285a246 Move more code under if(!IS_DIRECT(mb_type)). 
Originally committed as revision 21806 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 19:00:51 +00:00
David Conrad
161e8cf42c Move CODEC_FLAG_GRAY check to outer loop 
Originally committed as revision 21805 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 18:59:25 +00:00
David Conrad
7c2e31d1f0 Move branch based on custom mode outside the loop 
Originally committed as revision 21804 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 18:59:21 +00:00
David Conrad
eb691ef219 Directly check whether a fragment is coded for 4MV mode instead of iterating 
through the entire coded fragment list.

Originally committed as revision 21803 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 18:55:27 +00:00
David Conrad
15675ce609 Eliminate fragment -> macroblock mapping array 
Originally committed as revision 21802 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 18:55:24 +00:00
David Conrad
ea67614457 Eliminate macroblock -> fragment mapping array 
Originally committed as revision 21801 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 18:55:21 +00:00
David Conrad
19cd517dbf Eliminate superblock <-> macroblock mapping array 
Originally committed as revision 21800 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 18:55:17 +00:00
Thilo Borgmann
25608328af Support arithmetic decoding in ALS. 
Originally committed as revision 21799 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 18:24:13 +00:00
Michael Niedermayer
f2b3763736 Skip some more code that isnt needed for direct MBs. 
Originally committed as revision 21798 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 18:23:46 +00:00
Francesco Lavra
7df8af6385 Fix reading beyond buffer end on RA144Context.lpc_tables. 
Patch by Francesco Lavra (francescolavra -at- interfree -dot- it)

Originally committed as revision 21796 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 17:42:58 +00:00
Michael Niedermayer
5ca43c25f6 Move setting MB_TYPE_L0L1 for direct MBs up, this is simpler. 
Originally committed as revision 21794 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 15:57:49 +00:00
Michael Niedermayer
da452acac6 Dont calculate any surrounding MVs for temporal MBs 
Originally committed as revision 21793 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 15:30:27 +00:00
Michael Niedermayer
5134ad53ed Simplify if() 
Originally committed as revision 21791 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 13:28:04 +00:00
Michael Niedermayer
752cc0dcb2 Init sub_mb_type cleanly. 
Originally committed as revision 21790 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 13:14:07 +00:00
Michael Niedermayer
923bcb4048 100l Forgoten hunk.unbreak compile before someone notices. 
Originally committed as revision 21789 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 13:04:11 +00:00
Michael Niedermayer
af0d6581e1 Restructure spatial direct MV generation so that the zero predictior shortcut 
is closer at the top.
50-130 cpu cycles faster depending on which kind of direct MBs are meassured.

Originally committed as revision 21788 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 13:02:25 +00:00
Michael Niedermayer
edb4df436f Split spatial and temporal direct MV generation. 
A little  faster and needed for future optimizations.
This sadly leads to some code duplication (which i hope i can factor out
again after the optimizations on the direcr mv code are done)

Originally committed as revision 21787 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 03:46:51 +00:00
Ramiro Polla
3beb81e744 Fix compilation with --enable-libgsm on Gentoo and OpenSUSE. 
Patch by Ramiro

Originally committed as revision 21786 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 03:43:10 +00:00
Michael Niedermayer
812bfd7b44 Special case for spatial direct MV predictor being 0. 
a little less than 200 cpu cycles faster with the cathedral sample.

Originally committed as revision 21785 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 02:47:41 +00:00
Michael Niedermayer
828cfff63d Pack MVs together from the begin for spatial direct, this simplifies the code 
and is a bit faster (5-10 cpu cycles depending on what is meassured).

Originally committed as revision 21784 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 02:20:56 +00:00
Michael Niedermayer
02e8c5f0a5 Dont drop B frames without last_picture. 
Fixes issue1722

Originally committed as revision 21783 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 23:28:33 +00:00
David Conrad
b7098cc153 Special case VP5/6 chroma alignment on x86 as well 
Originally committed as revision 21782 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 22:01:42 +00:00
David Conrad
735acf567c Don't pre-calculate first_pixel 
3.6% faster on Elephants_Dream_HD-q7-aq7.ogg on my penryn

Originally committed as revision 21781 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 22:01:38 +00:00
David Conrad
a8de390163 Implement CODEC_CAP_DRAW_HORIZ_BAND for VP3 decoder 
Originally committed as revision 21780 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 22:01:35 +00:00
David Conrad
621f9a40b1 Cosmetics: reindent 
Originally committed as revision 21779 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 22:01:32 +00:00
David Conrad
256c0662ef Do loop filter per-row rather than per-frame 
3% faster on Elephants_Dream_HD-q7-aq7.ogg on my penryn

Originally committed as revision 21778 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 22:01:29 +00:00
David Conrad
fe3135564a Move apply_loop_filter above render_slice, it'll be used by the latter soon 
Originally committed as revision 21777 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 22:01:25 +00:00
David Conrad
ea3c2d5393 Export Theora colorspace info if present 
Originally committed as revision 21776 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 22:01:22 +00:00
David Conrad
337f5c6e30 Theora 3.4 doesn't exist; these fields were misunderstandings of the spec 
Originally committed as revision 21775 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 22:01:18 +00:00
David Conrad
45c3c92576 Remove unused code that's moved elsewhere 
Originally committed as revision 21774 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 22:00:29 +00:00
Michael Niedermayer
3566042a0d Try to support truncated h264 frames mixed with mpeg pes headers in mkv. 
Fixes issue1585

Originally committed as revision 21772 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 19:25:23 +00:00
Reimar Döffinger
9f1d760a27 Use int8_t instead of char, the signedness of char can differ between systems. 
Originally committed as revision 21771 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 18:18:35 +00:00
Ronald S. Bultje
fa65584f12 WMAVoice decoder. 
Originally committed as revision 21770 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-12 14:22:41 +00:00
Måns Rullgård
b5ab9b59e0 Fix build with --disable-mdct 
Originally committed as revision 21764 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-11 23:40:45 +00:00
Kostya Shishkov
94dde5c1ec Move 'chksum' declaration to the only block where that variable is used 
Originally committed as revision 21753 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-11 07:59:24 +00:00
Kostya Shishkov
f7d649185b Move band checksum verifying into preprocessor condition, so compiler won't 
complain about missing function prototype.

Originally committed as revision 21752 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-11 07:54:40 +00:00
Alex Converse
1edea057dd Output the first AAC frame. This is needed for SBR conformance. 
Originally committed as revision 21739 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 14:51:57 +00:00
David Conrad
19530266a5 Enable SSE2 (put|avg)_pixels_16_sse2 
SVQ1 chroma has been special-cased aligned to 16-bytes since at least r15466
Other architectures also assume 16-byte alignment here too but set STRIDE_ALIGN
to 16.

Originally committed as revision 21736 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-10 02:02:06 +00:00
Måns Rullgård
41c2bd0a26 ARMv6 optimised pix_sum 
Originally committed as revision 21705 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 16:13:52 +00:00
Måns Rullgård
66ec243d95 ARMv6 optimised pix_norm1 
Originally committed as revision 21704 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 16:13:49 +00:00
Måns Rullgård
0c28474c92 ARMv6 optimised sse16 
Originally committed as revision 21703 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 16:13:45 +00:00
Måns Rullgård
3132614305 ARMv6 optimised diff_pixels 
Originally committed as revision 21702 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 16:13:41 +00:00
Måns Rullgård
f73a626ae4 ARMv6 optimised get_pixels 
Originally committed as revision 21701 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 16:13:38 +00:00
Måns Rullgård
d2578ff9f1 ARMv6 optimised pix_abs8 
Originally committed as revision 21700 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 16:13:34 +00:00
Måns Rullgård
74cc33c235 ARMv6 optimised pix_abs16_y2 
Originally committed as revision 21699 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 16:13:31 +00:00
Måns Rullgård
39a760f678 ARMv6 optimised pix_abs16_x2 
Originally committed as revision 21698 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 16:13:29 +00:00
Måns Rullgård
e6056a9008 ARMv6 optimised pix_abs16 
Originally committed as revision 21697 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 16:13:26 +00:00
Måns Rullgård
38e016a7c9 ARMv6 optimised put_pixels functions except xy2 variants 
Originally committed as revision 21696 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 16:13:21 +00:00
Kostya Shishkov
5bebe94d86 Indeo 5 decoder 
Originally committed as revision 21695 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 07:55:07 +00:00
Michael Niedermayer
daaf6e3e9e Reorder and factorize mb_type ifs, 1 cpu cycle faster and simpler. 
Originally committed as revision 21694 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-09 00:19:03 +00:00
Michael Niedermayer
1be49ce54b Set partitioning to 16x16 for spatial direct MBs with mixed interlacing. 
11cylcles slower MV generation
98cycles faster MC

Originally committed as revision 21691 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-08 17:25:50 +00:00
Michael Niedermayer
3babc711d8 Detect spatial direct MBs partitioned smaller than 16x16 that can be partitioned 
as 16x16 (except ones changing interlacing relative to the colocated MB).
20 cycles slower during MV generation
175 cycles faster during MC

Originally committed as revision 21690 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-08 16:23:05 +00:00
Michael Niedermayer
8b9eb2dfec Detect equal 4x4 blocks in spatial direct MBs. 
19 cycles slower MV generation
575 cycles faster MC

Originally committed as revision 21689 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-08 13:05:24 +00:00