Commit Graph

23067 Commits

Author SHA1 Message Date
Anton Khirnov
e4ea625ab0 asfdec: don't strip the "WM/" prefix, this should be done during conversion.
Patch by Anton Khirnov wyskas gmail com

Originally committed as revision 22057 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 16:38:23 +00:00
Michael Niedermayer
36b54927fd Dont allocate direct_table 8 times too large.
Originally committed as revision 22056 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 15:29:12 +00:00
Michael Niedermayer
5e350863cc Store data in direct_table interleaved.
seems 20cpu cycles faster

Originally committed as revision 22055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 15:27:55 +00:00
Michael Niedermayer
013202d720 Simplify intra4x4_pred_mode_cache init.
Originally committed as revision 22054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 14:54:31 +00:00
Michael Niedermayer
662a5b2370 Reorder intra4x4_pred_mode so that we can read/write 4 values at once.
3-7 cpu cycles faster

Originally committed as revision 22053 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 14:26:12 +00:00
Michael Niedermayer
5b0fb5244d Store intra4x4_pred_mode per row only.
about 5 cpu cycles slower in the local code but should be overall faster
due to reduced cache use. (my sample though has too few intra4x4 blocks
for this to be meassureable easily either way)

Originally committed as revision 22052 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 14:02:39 +00:00
Michael Niedermayer
c2186cbddc unroll tiny and trivial loop. Same speed but clearer.
Originally committed as revision 22051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 12:51:32 +00:00
Benoit Fouet
a5517dcc9a asf: indent.
Patch from Anton Khirnov wyskas gmail com

Originally committed as revision 22050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 09:10:37 +00:00
Benoit Fouet
9b54f4328e asf: add more entries to metadata conv table.
Patch from Anton Khirnov wyskas gmail com

Originally committed as revision 22049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 09:09:39 +00:00
Michael Niedermayer
e1c88a2138 Cut the size of mvd_table by yet another factor of 2.
The code read/write code itself was 1 cycle faster, overall its
likely more due to cache effects

Originally committed as revision 22048 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 04:11:33 +00:00
Michael Niedermayer
d43c192236 Keep mvd_table values of only 2 mb rows.
Originally committed as revision 22047 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 02:42:25 +00:00
Stefano Sabatini
b6a4185367 10l: add prefix "TAG:" to the metadata tags key showed for each stream.
This is consistent with the metadata displaying in show_format() and
with the documentation.

Originally committed as revision 22046 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 00:16:43 +00:00
Stefano Sabatini
912dd63ecb Cosmetics: replace "filename" to "arg" for the name of the argument of
opt_input_file(). More consistent and more clear, as "filename" can be
easily confused with the global "input_filename".

Originally committed as revision 22045 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-25 00:05:01 +00:00
Alex Converse
c4a90caae2 aac: Keep decode_band_types() from eating all padding at the end of a buffer.
Due to a shortcoming in the AAC specification, if an all zero buffer is
fed to section data decoding it will never terminate. That means without
a buffer exhaustion check decode_band_types() will consume all input
buffer padding. Worse if a get_bits() implementation that returns zeros
when padding is exhausted is used, the function will never terminate.

The fixes that by added a buffer exhaustion check in the sectioning
decoding loop.

Originally committed as revision 22044 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 23:56:52 +00:00
Stefano Sabatini
3314799368 Extend doxy for the src parameter of av_fifo_generic_write().
@patchby Tomas Härdin |tomas dot hardin at codemill dot se|

Originally committed as revision 22043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 23:52:52 +00:00
Michael Niedermayer
09ef1ace4b 3rd and hopefully last 100l fix.
Originally committed as revision 22041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 22:13:20 +00:00
Michael Niedermayer
3393bff10d Fix doxy and assert().
Originally committed as revision 22040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 22:05:51 +00:00
Michael Niedermayer
377fc38d5d Try to fix 100l compilation failure on some systems.
Originally committed as revision 22039 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 21:55:55 +00:00
Michael Niedermayer
b5bd070029 Change mvd_cache & mvd_table to 8bit, this is overall a bit faster
for high resolution videos.
about 20cycles faster per MB for cathederal.

Originally committed as revision 22038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 20:43:06 +00:00
Michael Niedermayer
8ef4e65e94 AV_COPY16() & AV_ZERO16()
Originally committed as revision 22037 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 20:38:31 +00:00
Michael Niedermayer
f3ea29bfa3 Extend fill_rectangle() support for 16bit
Originally committed as revision 22036 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 20:37:58 +00:00
Michael Niedermayer
81b5e4ee92 Calculate mvd without abs()
same speed (ask gcc why, i dont know)

Originally committed as revision 22035 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:50:02 +00:00
Anton Khirnov
fce4448948 Read ASF metadata as proper UTF-16 and spit it out as proper UTF-8 in our
metadata system.

Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22034 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:19:54 +00:00
Anton Khirnov
a106d4112d Don't add WM prefixes to all written ASF tags.
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22033 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:17:32 +00:00
Michael Niedermayer
855a1ba5e8 switch back to (amvd>2)+(amvd>32), its 5 cpu cycles faster now.
Originally committed as revision 22032 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:16:48 +00:00
Anton Khirnov
531d8fa308 Eliminate put_str16().
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:09:49 +00:00
Anton Khirnov
ae529ddb32 Add PUT_UTF16() macro.
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22030 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:08:30 +00:00
Michael Niedermayer
01b35be14a Factorize common code from the top of decode_cabac_mb_mvd()
10-15 cpu cycles faster.

Originally committed as revision 22029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:06:02 +00:00
Anton Khirnov
6164842300 Mention that metadata tags are (unvalidated) UTF-8.
Patch by Anton Khirnov <wyskas gmail com>.

Originally committed as revision 22028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 18:01:44 +00:00
Michael Niedermayer
6d0155c79c Replace mvd>2 + mvd>32 by MIN((mvd+28)*17>>9, 2)
same speed as far as i can meassure but it might have fewer branches on some
archs.
Idea from x264 / jason

Originally committed as revision 22027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 16:16:08 +00:00
Ramiro Polla
bc77fce6ba Clear freed pointer in ffplay.c.
Fixes a crash when audio stream is cycled twice.

Originally committed as revision 22026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 14:45:18 +00:00
Michael Niedermayer
90332debfe Replace ad-hoc fill rectangle by fill_rectangle().
Originally committed as revision 22025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 13:12:09 +00:00
Kostya Shishkov
d2df291f73 ff_msmpeg4_decode_init() calls ff_h263_decode_init() which calls
MPV_common_init(), so calling both is redundant and leads to memory
leaks in WMV3/VC-1 decoder. Thus use only the first function in
WMV3/VC-1 decoder initialization.

Originally committed as revision 22024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 13:11:38 +00:00
Peter Ross
601e74d366 it is not necessary to display the decoder name, as av_log() automatically prints the context
Originally committed as revision 22023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 11:51:42 +00:00
Peter Ross
dd80be5bfc low-complexity Bink file seeking
Originally committed as revision 22022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 11:43:33 +00:00
Peter Ross
7e276c85b1 set AVINDEX_KEYFRAME correctly for bink
Originally committed as revision 22021 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 11:30:38 +00:00
Yann Coupin
8d819221db Correctly increment continuity_counter in PCR packets.
Patch by Yann Coupin, yann.coupin+ffmpeg gmail

Originally committed as revision 22020 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 10:56:13 +00:00
Benoit Fouet
6538c0f1c6 asfdec: skip byte array tags.
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22019 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 07:34:12 +00:00
Benoit Fouet
27e7492771 asfdec: add a debug message about skipped tags.
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 07:33:18 +00:00
Benoit Fouet
47794b9d3e asfdec: fix a memleak.
Patch from Anton Khirnov wyskas gmail

Originally committed as revision 22017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 07:32:20 +00:00
Benoit Fouet
514b73cf0d asfdec: only unicode tags must have even length.
Patch from: Anton Khirnov wyskas gmail

Originally committed as revision 22016 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 07:31:03 +00:00
Anton Khirnov
43382b5f13 Introduce metadata conversion table for NUT muxer and demuxer.
Patch by Anton Khirnov (wyskas, do no evil mail)
Thread "[PATCH] nut metadata conversion table"

Originally committed as revision 22015 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 06:27:12 +00:00
Ramiro Polla
c8c0ac6b26 FFprobe: take only one input file.
Originally committed as revision 22014 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 06:14:59 +00:00
Michael Niedermayer
9127a369ad Replace /2 by faster >>1 as the mvd values are now all positive.
Originally committed as revision 22013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 01:57:31 +00:00
Michael Niedermayer
5c34e36a23 Remove unused variable. Seems i forgot to commit this.
Originally committed as revision 22012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-24 01:56:27 +00:00
Michael Niedermayer
a15fdd7ce3 Attempt to fix issue1728 and regression of issue203
Originally committed as revision 22011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 23:41:11 +00:00
Michael Niedermayer
b8c93c483b Set ist->pts to something that isnt guranteed to entangle itself with stream copying b frames.
Originally committed as revision 22010 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 22:06:36 +00:00
Diego Biurrun
fc298fd9be Add -Wmissing-prototypes to CFLAGS if available.
Originally committed as revision 22009 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 21:03:25 +00:00
Michael Niedermayer
9f7490a09c Also favor streams with more packets in ffplay.
Originally committed as revision 22008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 17:35:44 +00:00
Michael Niedermayer
256ab3ed9d Dont modify wanted_stream.
Originally committed as revision 22007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-23 17:09:53 +00:00