Commit Graph

20167 Commits

Author SHA1 Message Date
Eric Buehl
352666c17c Support varying frame sizes in a single file.
patch by Eric Buehl, eric.buehl gmail com

Originally committed as revision 19226 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 14:43:36 +00:00
Patrick Dehne
d52b90bdb4 Add support for id3 tag parsing for ADTS AAC streams
Patch by Patrick Dehne ( patrick mysonicweb com )

Originally committed as revision 19225 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 14:36:47 +00:00
Patrick Dehne
50fcd5be36 Move id3v1/id3v2 handling code from mp3.c to id3v[12].c.
patch by Patrick Dehne, patrick mysonicweb com

Originally committed as revision 19224 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 14:03:35 +00:00
Reimar Döffinger
2a04d6e772 Add support for muxing XSUB subtitles to AVI muxer.
Originally committed as revision 19223 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 13:26:10 +00:00
Reimar Döffinger
a4276ba2ac Add support for encoding XSUB subtitles. Muxing support is still missing.
Based on code by DivX, Inc., heavily changed by Björn Axelsson [gecko acc.umu.se] and me.

Originally committed as revision 19222 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 09:56:35 +00:00
Reimar Döffinger
4bbe788ab7 Add pts field to AVSubtitle, for use by future XSUB encoder (and XSUB decoder
should use it, too).

Originally committed as revision 19221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-19 08:28:07 +00:00
Stefano Sabatini
97668ac7f3 Rename tests/ffmpeg.regression.ref to tests/vsynth.regression.ref,
since that is the name of the corresponding test.

Originally committed as revision 19220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-18 23:44:05 +00:00
Jason Garrett-Glaser
bc7ea1e5cf Add fourcc 0x10000004, seems to actually be MPEG4. Fixes a problematic AVI file.
Originally committed as revision 19219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-18 19:31:12 +00:00
Vladimir Voroshilov
17dbe25438 G.729 decoding routine (skeleton, including parameters decoding).
Originally committed as revision 19218 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-18 18:14:38 +00:00
Michael Niedermayer
71ee651559 Print why av_find_stream_info() failed, this is a rather common question
during debugging ...

Originally committed as revision 19217 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-18 00:22:08 +00:00
Måns Rullgård
2da4e5e3e1 ARM: slightly faster NEON H264 horizontal loop filter
Originally committed as revision 19216 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-17 22:33:04 +00:00
Ronald S. Bultje
f4ca612fbd Set restrictions on packet_size, as per ISO-11172 / H-222 specifications
(max packet size should fit in 13 bits as a kB value, so 1<<23, plus the
header which is 10 bytes), and as per mpegenc.c internal assumptions
(min packet size is 20 bytes). See "[PATCH] make packet_size in
AVFormatContext unsigned" thread.

Originally committed as revision 19215 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-17 19:04:02 +00:00
Vitor Sessak
fa8c408b26 Do not call rgb2rgbWrapper() for rgb48*, there is no special converter
yet for those formats

Originally committed as revision 29371 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2009-06-17 18:40:19 +00:00
Benoit Fouet
61ac77f1af Remove a test on an always false condition.
Originally committed as revision 19214 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-17 07:05:17 +00:00
Jason Garrett-Glaser
351653a51e VC-1/WMV: Remove redundant ff_init_block_index() calls.
These are only supposed to be called once per row, not once per macroblock.
~1.5% faster according to oprofile.

Originally committed as revision 19213 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-17 05:54:42 +00:00
Alexander Strange
0b389aee4d Add '.mp1' for MP1 audio in MOV/CAF.
Tested with streamcopy of 'mp1-sample.mp1' in incoming.

Originally committed as revision 19212 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-17 00:37:06 +00:00
Jason Garrett-Glaser
b46f18e5d2 Add ".mp2" as a fourcc for mp2 audio in MOV. Fixes a problematic MOV file.
Originally committed as revision 19211 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 23:50:02 +00:00
Art Clarke
e1d8d7bb4b Downgrade message log level (from AV_LOG_ERROR to AV_LOG_DEBUG) about
skipped metadata packet in FLV demuxer.

Patch by Art Clarke a${surname} At xuggle - com.

Originally committed as revision 19210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 23:14:59 +00:00
Stefano Sabatini
4c97a6fafa Move opt_loglevel() from ffmpeg.c to cmdutils.c.
Originally committed as revision 19209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 23:09:03 +00:00
Ramiro Polla
77ddf4df94 Make ffmpeg able to set the loglevel option using strings
corresponding to the various log levels.

Patch by Ramiro.

Originally committed as revision 19208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 23:02:53 +00:00
Alexander Strange
d2d5e06735 H.264: Fix memory leaks with multithreading.
The threads' contexts and rbsp_buffers were not freed at the end
of decoding.

Fixes issue 1581

Originally committed as revision 19207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 21:50:36 +00:00
Jason Garrett-Glaser
73b02e2460 SSE version of clear_blocks
Originally committed as revision 19206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 17:33:57 +00:00
Jason Garrett-Glaser
010f98f96a VC-1/WMV3 decoding: don't clear blocks unless they're actually used.
~8% faster VC-1 decoding.
Possible future optimization: clear blocks after use instead of before, and for
DC-only blocks, only clear the DC coefficient.

Originally committed as revision 19205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 09:09:03 +00:00
Jason Garrett-Glaser
4f717c69ed idct_dc for VC-1/WMV3 decoder; ~11% faster decoding overall.
Includes mmx2 asm for the various functions.
Note that the actual idct still does not have an x86 SIMD implemtation.
For wmv3 files using regular idct, the decoder just falls back to simple_idct,
since simple_idct_dc doesn't exist (yet).

Originally committed as revision 19204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 09:00:55 +00:00
Jason Garrett-Glaser
41faa87886 Fix typo in vc1.c, make capitalization in warning/error messages more consistent.
Originally committed as revision 19203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-16 00:48:07 +00:00
Måns Rullgård
0c3b2d6586 Add "config" make target to rerun configure with old options
Originally committed as revision 19202 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 22:12:23 +00:00
Måns Rullgård
b04251c5d0 configure: properly quote configure options stored in config.*
Originally committed as revision 19201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 22:12:21 +00:00
Ramiro Polla
7cc8d616aa Fix unaligned accesses by doing bytewise access until aligned, then
continuing in 32-bit quantities.
Fixes crash observed on sparc during FATE mlp test.
Patch by Ramiro.

Originally committed as revision 19200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 14:38:30 +00:00
Patrick Dehne
d9982edfed The AAC demuxer now depends on id3v1.o.
patch by Patrick Dehne, patrick mysonicweb com

Originally committed as revision 19199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 08:38:11 +00:00
Baptiste Coudurier
53e099de8b check atom size against edit_count to avoid very long loop
Originally committed as revision 19198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 02:07:41 +00:00
Baptiste Coudurier
7060667580 fix probing and demuxing of pond.dv, issue #887
Originally committed as revision 19197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-15 01:41:59 +00:00
Baptiste Coudurier
d310d56a36 do not use av_parser_change for h264 which uses bitstream filter, fix #1027
Originally committed as revision 19196 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 23:55:25 +00:00
Måns Rullgård
a4ddf509fe regtest: print commands also for image format tests
Originally committed as revision 19195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 23:14:56 +00:00
Måns Rullgård
50f3fabc48 Print error message when output buffer allocation fails
Originally committed as revision 19194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 23:14:54 +00:00
Baptiste Coudurier
2c608fed3a print error when dv frame profile cannot be found
Originally committed as revision 19193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 22:41:30 +00:00
Baptiste Coudurier
d509c743b7 check if frame size matches old sys and assumes corrupted input, fixes #1192
Originally committed as revision 19192 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 22:34:28 +00:00
Diego Biurrun
90b4f09177 Merge FreeBSD and DragonFlyBSD OS detection sections.
Apparently DragonFlyBSD does not need memalign either.

Originally committed as revision 19191 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 14:49:46 +00:00
Adam Hoka
d6dcfc7f5b Add DragonFlyBSD to the list of supported OSes.
patch by Adam Hoka, ahoka NetBSD org

Originally committed as revision 19190 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 13:18:10 +00:00
Peter Ross
7d58228055 Initialise MAD decode_block_intra() loop iterator to zero.
Originally committed as revision 19189 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 09:55:28 +00:00
Vladimir Voroshilov
94994d8d9a G.729 decoder initialization routine (skeleton)
Originally committed as revision 19188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 02:31:06 +00:00
Vladimir Voroshilov
730c1e4a06 Replace MAX_SUBFRAME_SIZE and ctx->subframe_size with SUBFRAME_SIZE,
since subframe length is the same in all G.729 modes.

Originally committed as revision 19187 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-14 02:29:39 +00:00
Justin Ruggles
d7bb185f99 Add a VorbisComment metadata conversion table and use it in the FLAC and
Ogg demuxers.

Originally committed as revision 19186 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 22:45:58 +00:00
Justin Ruggles
7ca1295985 Do not guess the channel layout when getting its string value.
Originally committed as revision 19185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 22:33:13 +00:00
Aurelien Jacobs
4f909c7675 matroskadec: prepend TargetType to metadata key name
Originally committed as revision 19184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 22:29:38 +00:00
Justin Ruggles
0fb6a8b339 Remove the 3-front-channel layout from the list of channel layout
aliases.  Calling this "surround" is confusing and questionable.

Originally committed as revision 19183 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 18:57:54 +00:00
Kostya Shishkov
0d5390b062 Correct reading bits in MPC SV8 base codes (when we have to read 0 or >16 bits).
Originally committed as revision 19182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 06:41:51 +00:00
Kostya Shishkov
8c1ff0abae Allocate a bit more memory for MPC SV8 seek table, so bitreader won't read
beyond allocated block.

Originally committed as revision 19181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 06:39:01 +00:00
Jason Garrett-Glaser
67fe508916 Analysis of logs show that there are in fact some files with m1v1 too (not just m2v2),
which is documented to be MPEG-1 video.  Adding fourcc to isom.c.

Originally committed as revision 19180 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 03:02:16 +00:00
Peter Ross
eacfe8581d Electronic Arts demuxer: support Madcow video tag
Originally committed as revision 19179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 02:20:54 +00:00
Peter Ross
c63ea92bf2 Electronic Arts Madcow decoder
Originally committed as revision 19178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-13 02:19:41 +00:00