Commit Graph

167 Commits

Author SHA1 Message Date
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
0cd55b0c18 Add CODEC_ID_DNXHD into the 25 fps case.
Merged from ffmbc.

Originally committed as revision 20841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 22:12:20 +00:00
Michael Niedermayer
b68a7679f9 Raise threshold of h263 probe by 1 to avoid misdetection.
Fixes issue 1588.

Originally committed as revision 20765 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-08 12:34:08 +00:00
Michael Niedermayer
f76eef99a2 Add out commented av_log to debug h263_probe.
Originally committed as revision 20764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-08 12:33:00 +00:00
Carl Eugen Hoyos
0f87b77176 Use enum instead of integer types where appropriate.
Originally committed as revision 20482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-08 23:48:15 +00:00
Daniel Verkamp
79c0790789 Fix pcm_read_seek () when the position it calculates is greater than 2 GB.
pcm_read_seek() puts the return value of url_fseek() in an int and then
compares < 0 to see if an error occurred; if the position is greater
than 2 GB, the 32-bit signed int result will be < 0.

Change the type of ret to int64_t to avoid the wraparound.

patch by Daniel Verkamp, daniel drv nu

Originally committed as revision 20169 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-05 09:19:42 +00:00
Reimar Döffinger
c3db0bc61d Return any error return values from av_get_packet, get_buffer etc. unchanged
in the raw demuxers.
Also remove special handling of 0-size reads, if they are due to an error/eof,
these are already converted to the appropriate error by get_buffer.

Originally committed as revision 20137 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-02 06:40:50 +00:00
Reimar Döffinger
22a7e19b50 Make rawvideo_read_packet return partial frames.
This is consistent with other demuxers and also fixes a memleak (memory
allocated for partial frame data was leaked).

Originally committed as revision 20130 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 17:32:22 +00:00
Reimar Döffinger
8cb724c5c4 Simplify: remove pointless {} and else
Originally committed as revision 20129 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 17:26:20 +00:00
Reimar Döffinger
d4c1803e0e Remove pointless setting of pkt->size, av_get_packet already handles this.
Originally committed as revision 20128 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 17:22:01 +00:00
Reimar Döffinger
c67031e7cf av_new_packet failing should return ENOMEM, not EIO.
Originally committed as revision 20126 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-01 16:10:09 +00:00
Reimar Döffinger
4b4ac5c7a8 Sync AC3 probe values with MP3 probe values, they have to avoid similar issues.
This fixes ffmpeg-generated files with -acodec ac3 being detected as raw ac3
instead of MPEG.

Originally committed as revision 20075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-29 10:23:47 +00:00
Michael Niedermayer
2a3caca2b1 Make h261 and mpegvideo probe a little more robust so they dont fail with
slightly different probetest.

Originally committed as revision 19856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-15 13:27:13 +00:00
Reimar Döffinger
98487a5b69 Make dnxhd probe more strict, fail if we detect values in header that would
make our decoder fail anyway.
dnxhd probe now passes probetest.

Originally committed as revision 19847 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 21:50:23 +00:00
Michael Niedermayer
89c4e176f6 Rewrite h261_probe().
New code can detect h261 startcodes even when the first is damaged or not at the
begin. It also passes probetest v2 & v3.

Originally committed as revision 19845 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 21:29:19 +00:00
Reimar Döffinger
05bdd33a12 Make DTS probe more robust against false positives (as e.g. probetest shows).
In particular check that the detected markers clearly indicate a specific DTS
format (a wild mixture of e.g. little- and big-endian markers is unlikely to be
a valid DTS file) and ensure the markers appear with sufficient frequency.

Originally committed as revision 19844 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 20:28:10 +00:00
Michael Niedermayer
e4c01d408a Rewrite h263_probe().
The new code should detect h263 even if the first startcode is damaged or
somewhere else than the first byte. It also passes probetest v2 as just
posted on ffmpeg-dev.

Originally committed as revision 19841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-14 19:06:36 +00:00
Måns Rullgård
63613fe615 Replace WORDS_BIGENDIAN with HAVE_BIGENDIAN
Originally committed as revision 19508 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-26 12:20:04 +00:00
Aurelien Jacobs
23251d751b fix compilation of cavsvideo demuxer
Originally committed as revision 19506 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-24 21:28:03 +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
Andreas Öman
0e1ccdeb11 It should be #if, not #ifdef
Originally committed as revision 18659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-22 08:39:46 +00:00
Ramiro Polla
9145021d68 Add raw MLP muxer.
Originally committed as revision 18652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-21 23:23:15 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h.
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
Baptiste Coudurier
a3d23e15fb fix 6 channels raw pcm demuxing, raw pcm now demux a fixed number of samples
Originally committed as revision 18453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-12 00:25:37 +00:00
Ramiro Polla
23d9cc4563 Support raw TrueHD files
Originally committed as revision 18049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-19 21:46:56 +00:00
Reimar Döffinger
bd36f175ab Make pcm_read_seek treat negative time stamps as 0, this avoids incorrectly
seeking before data_offset and is more consistent with how the generic index
seeking code handles it.

Originally committed as revision 17964 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-14 20:50:54 +00:00
Michael Niedermayer
4022fe01a6 Change the timebase of the raw demuxer to one that can represent the ts of fields.
Originally committed as revision 17675 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-01 03:48:35 +00:00
Justin Ruggles
81f052cb7d Separate the raw FLAC demuxer from raw.c and put in a new file,
flacdec.c.

Originally committed as revision 17660 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-28 17:24:46 +00:00
Justin Ruggles
caee91f7d0 Separate the raw FLAC muxer from raw.c to its own file, flacenc.c.
Originally committed as revision 17601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-26 02:21:43 +00:00
Stefan Gehrer
b81350a866 consistent naming of Chinese AVS raw demuxer
Originally committed as revision 17527 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-22 14:27:50 +00:00
Stefan Gehrer
9f2fc1268c add raw demuxer for Chinese AVS elementary streams
Originally committed as revision 17473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-21 10:34:29 +00:00
Benoit Fouet
ff9843ca39 Add a context to av_log() call.
Originally committed as revision 17376 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 16:09:58 +00:00
Diego Biurrun
b4ee1d3911 Make format long_names consistent.
Originally committed as revision 17360 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-16 01:55:28 +00:00
Benoit Fouet
bbfb80f363 Whitespace cosmetics to align return statements.
Originally committed as revision 16826 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 18:01:26 +00:00
Benoit Fouet
16f753f43f Check buffer is inside what is passed when probing for flac.
Originally committed as revision 16825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-27 18:00:40 +00:00
David DeHaven
6cde949a20 Handle ID3v2 tags in raw FLAC streams by skipping them.
Patch by David DeHaven (dave sagetv com)

Originally committed as revision 16764 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25 00:16:27 +00:00
Alex Converse
ac3ef4a41b Fix probing of files with ID3v2 tags. Discussed at
http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/2009-January/059302.html

Originally committed as revision 16688 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 21:54:06 +00:00
Diego Biurrun
406792e7b0 cosmetics: Remove pointless period after copyright statement non-sentences.
Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-19 15:46:40 +00:00
Aurelien Jacobs
b250f9c66d Change semantic of CONFIG_*, HAVE_* and ARCH_*.
They are now always defined to either 0 or 1.

Originally committed as revision 16590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-13 23:44:16 +00:00
Michael Niedermayer
492322fccc Remove silly FIXME comment.
Originally committed as revision 16122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-14 14:01:12 +00:00
Michael Niedermayer
2ba0cdd527 ADTS AAC probe.
fixes issue400

Originally committed as revision 15977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-12-02 15:43:47 +00:00
Baptiste Coudurier
bd09e8a7df raw dnxhd de/muxer
Originally committed as revision 15674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 01:42:57 +00:00
Michael Niedermayer
bf9067cf3e Assume mono if no other information for raw.
Should fix issue687

Originally committed as revision 15631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-18 10:40:31 +00:00
Diego Biurrun
bc5c918ea8 Remove offset_t typedef and use int64_t directly instead.
The name offset_t is easily confused with the standard off_t type and
*_t is POSIX reserved namespace if any POSIX header is included.

Originally committed as revision 15533 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-03 10:16:29 +00:00
Justin Ruggles
e1a12934c5 write number of samples in FLAC extradata.
based on a patch by Mathieu Velten (matmaul gmail com).

Originally committed as revision 15324 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-14 20:00:36 +00:00
Justin Ruggles
bdf6972c4b change back to using CONFIG_*_DEMUXER for ac3_eac3_probe(), but use it
correctly this time.

Originally committed as revision 15147 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 17:20:49 +00:00
Aurelien Jacobs
75198e7a6d simplify ac3_probe() and eac3_probe(). patch by Aurelien Jacobs.
Originally committed as revision 15145 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 15:31:14 +00:00
Justin Ruggles
4d951ef86d check ENABLE_*_DEMUXER instead of CONFIG_*_DEMUXER
Originally committed as revision 15144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 15:28:15 +00:00
Justin Ruggles
2988c93d94 create a separate codec_id for E-AC-3
Originally committed as revision 15143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-09-01 14:33:54 +00:00