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

23163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefano Sabatini
f47a7cb777 Move read_line() and write_line() definition from pixdesc.h to 
pixdesc.c, which are now not anymore marked as static inline.

Fix the inclusion of the private header intreadwrite.h in the public
header pixdesc.h.

Originally committed as revision 21854 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 20:17:50 +00:00
Ronald S. Bultje
a636b58ce1 Fix two problems (no idea how this ever worked): 
- the return value of url_open_dyn_*buf() is 0 on success, so using
   if (!(res = url_open_dyn_*buf())) return res; is not going to work
- url_open_dyn_packet_buf actually writes the max_packet_size before
   each piece of data. Feeding this to the ASF demuxer will never work.
   Therefore, use url_open_dyn_buf() instead.

Originally committed as revision 21853 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 19:26:49 +00:00
Ronald S. Bultje
4abd85141c Revert r21851. 
Originally committed as revision 21852 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 18:25:05 +00:00
Ronald S. Bultje
298d2fd304 Don't return 0 if buffer setup failed. That signals the RTSP demuxer that 
the packet was filled in, leading to virtually random behaviour in the
decoder later on. Instead, return a negative value.

Originally committed as revision 21851 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 18:19:28 +00:00
Anton Khirnov
ed7694d8cf Set lavf identification string globally in av_write_header(), rather 
than inside the muxers. Remove special handling of "encoder" tags from
AVI and MP3 muxers.

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 21850 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 16:32:25 +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
899605f150 Support IFF ANNO (annotation) chunk type 
Originally committed as revision 21847 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-16 09:55:56 +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
Anton Khirnov
83a6c1a69c Strings in extended content header are UTF16, 
so terminating NULLs are 2 bytes long, not 1.

Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 21841 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 21:19:40 +00:00
Anton Khirnov
4a3104a96a workaround for broken files created by previous versions of asfenc. 
Patch by Anton Khirnov, wyskas gmail

Originally committed as revision 21840 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-15 21:14:47 +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
Reimar Döffinger
4130f7393b Reindent 
Originally committed as revision 21824 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 19:00:36 +00:00
Reimar Döffinger
3adcfbbeb5 Optimize h261_probe function, since it is far slower than all others. 
About 5 times faster.

Originally committed as revision 21823 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 18:59:56 +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
Thilo Borgmann
d3037bbe6b Add myself as maintainer of bgmc.[ch]. 
Originally committed as revision 21820 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-14 10:17:58 +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
Thilo Borgmann
09946fb109 Add myself as contributor. 
Originally committed as revision 21808 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 19:24:32 +00:00
Thilo Borgmann
071cfdce4b Add myself as ALS maintainer. 
Originally committed as revision 21807 to svn://svn.ffmpeg.org/ffmpeg/trunk
 2010-02-13 19:23:39 +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