Commit Graph

5851 Commits

Author SHA1 Message Date
Stefano Sabatini 8d5e638f04 Make url_fseek() return AVERROR_EOF rather than AVERROR(EPIPE) if end
of file is reached.

Originally committed as revision 22590 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-18 00:22:58 +00:00
Ronald S. Bultje a7a85dc4c2 Cast sample_fmt (as read from bitstream as a 16-bit value) to int16, so that
negative values, e.g. SAMPLE_FMT_NONE (-1), are read correctly also.

Originally committed as revision 22585 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-17 15:14:18 +00:00
Måns Rullgård c7f625eecf Fix erroneous behaviour when format probe hits end of file
If the format probe hits end of file, do not add the error code
to the buffer position.  This is obviously wrong, and with a
small input file would cause a negative buffer overflow.

Fixes issue 1818.

Originally committed as revision 22571 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-16 21:45:30 +00:00
Aurelien Jacobs 972ffe6220 rename av_read_frame_flush to ff_read_frame_flush
it is an internal function, not part of public API

Originally committed as revision 22562 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 23:15:24 +00:00
Aurelien Jacobs 588af13fee rename av_program_add_stream_index to ff_program_add_stream_index
it is an internal function, not part of public API

Originally committed as revision 22561 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 23:14:07 +00:00
Greg Maxwell fbe8c56dfe Correctly write last 0 lacing value when packet size is multiple of 255, patch by Greg Maxwell, gmaxwell at gmail dot com
Originally committed as revision 22559 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 23:04:09 +00:00
Michael Niedermayer 493f54ada0 Add AVSEEK_FORCE flag to indicate that the code should attempt to seek
by any means.

Originally committed as revision 22557 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 22:54:22 +00:00
Aurelien Jacobs 6dfa52c8bd matroskadec: fix missing dependency
Originally committed as revision 22555 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 22:37:14 +00:00
Jai Menon f75ab7a645 cosmetics : Print newline after error message.
Originally committed as revision 22551 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 19:03:48 +00:00
Martin Storsjö db128802c5 Reindent
Originally committed as revision 22549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 16:36:54 +00:00
Martin Storsjö ad2ae6dbaf Don't let ff_rtsp_read_reply skip interleaved RTP/TCP packets in rtsp_write_packet.
Skip interleaved packets manually and recheck if there's more to be read.

Originally committed as revision 22548 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 16:36:20 +00:00
Martin Storsjö ec55edba31 Make rtsp_skip_packet non-static, add ff prefix
Originally committed as revision 22547 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 16:31:15 +00:00
Martin Storsjö c040badb70 Reindent
Originally committed as revision 22546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 16:15:51 +00:00
Martin Storsjö c07c6f8183 RTSP: Synchronize the start time of the chained RTP muxers
This makes sure that the streams get correctly synchronized when viewed,
previously the streams were out of sync by as much time as it took
between the initialization of the individual muxers.

Originally committed as revision 22545 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 14:20:07 +00:00
Martin Storsjö b1d55e5e4f Use AVFormatContext.start_time_realtime in the RTP muxer
Originally committed as revision 22543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 10:37:12 +00:00
Martin Storsjö 2dad0dcec6 Move the NTP offset definitions to internal.h
Originally committed as revision 22542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 10:36:30 +00:00
Martin Storsjö b8819c85b5 Add a new field AVFormatContext.start_time_realtime
Currently intended to be used by the RTP muxer

Originally committed as revision 22540 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 10:29:37 +00:00
Anton Khirnov 63100f5885 riff: don't pad extradata when writing ASF.
Patch by Anton Khirnov mirror(moc liamg saksyw)

Originally committed as revision 22539 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 08:49:02 +00:00
Aurelien Jacobs e536ccd653 matroskadec: use more appropriate error code
Originally committed as revision 22535 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-15 00:19:22 +00:00
Aurelien Jacobs e4a9e3cc7c move ff_url_split() and ff_url_join() declarations to internal.h
those functions are not part of the public API

Originally committed as revision 22534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 23:59:48 +00:00
Micah F. Galizia eadd495d06 Move the probe loop from av_open_input_file() into its own method
av_probe_input_buffer() so that it can be reused. Here are a few
differences to the original way things were probed:

- maximum probe buffer size can be specified as a parameter.

- offset within the stream to probe from can be specified as a parameter.

- instead of seeking back to the start each time a probe fails, stream
  data is appended to the reallocated buffer. This lowers the amount
  of data read from the stream (there is no repetition) and results in
  fewer closed and reopened streams (when seeking fails).

New attempt after r22296, which was revert in r22315 due to a FATE
failure.

See the thread:
Subject: [FFmpeg-devel] [PATCH] Move av_open_input_file probe loop to its own method
Date: 2010-03-05 03:23:57 GMT

Patch by Micah F. Galizia printf("%s%s@%s.%s", "micah", "galizia", "gmail", "com").

Originally committed as revision 22532 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 22:40:16 +00:00
Reimar Döffinger 28eb577390 Avoid creating tiny (possibly only 64 bytes large) audio packets resulting in
huge processing and memory usage overhead for avi files with raw PCM audio.

Originally committed as revision 22521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-14 13:38:00 +00:00
Stefano Sabatini 5ae092ee34 Replace all the occurrences of AVERROR_EIO with AVERROR(EIO), and mark
AVERROR_EIO for deletion at the next major bump.

Originally committed as revision 22513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-13 19:19:44 +00:00
David Conrad 3477897e5a oggdec: Set packet duration for ogm streams
Originally committed as revision 22493 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-13 05:55:57 +00:00
Aurelien Jacobs 6b10228a55 matroskadec: add support for SIPR audio tracks
Originally committed as revision 22492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 23:49:06 +00:00
Aurelien Jacobs 1ab0406db1 export rm_reorder_sipr_data() for future use by matroska demuxer
Originally committed as revision 22491 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 23:35:59 +00:00
Aurelien Jacobs adae9fa65e export sipr_subpk_size for future use by matroska demuxer
Originally committed as revision 22490 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 23:34:30 +00:00
David Conrad 81b743eb10 oggdec: Pass packets to header() until the stream is done with them
This fixes some old ogm files that had the 3rd vorbis header after a data
packet in another stream. This is invalid in ogg, but this change shouldn't
affect the behaviour of any valid file.

Originally committed as revision 22478 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:17:01 +00:00
David Conrad 8730fad595 oggdec: Parse ogm chapters
Originally committed as revision 22477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:16:57 +00:00
David Conrad 2e5085854c oggdec: Cosmetics
Originally committed as revision 22476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:16:54 +00:00
David Conrad d8ba748359 oggdec: Read ogm metadata
Originally committed as revision 22475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:16:51 +00:00
David Conrad 533c30fced Const correctness for vorbis_comment
Originally committed as revision 22474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:16:47 +00:00
David Conrad b53cde48bd oggdec: Metadata is per-stream; don't merge multiple streams' together
Originally committed as revision 22473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:16:44 +00:00
David Conrad e4d2d8c5d7 Add ff_ prefix to vorbis_comment
Originally committed as revision 22472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-12 05:16:39 +00:00
Martin Storsjö 34056cbba5 Fix a crash in the H.263 RTP packetizer
If size == 1 and buf[0] == 0 and buf[1] == 0 (the first byte after the
buffer), it would set size = -1 and crash in the later memcpy.

Originally committed as revision 22469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 16:26:14 +00:00
Peter Ross 70b462cc29 Prevent memory leak introduced in r22389 in Bink demuxer: pass partial packets to decoder.
Originally committed as revision 22468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 12:29:02 +00:00
Martin Storsjö 5c7fd91010 Cosmetics, break a long line, fix brace placement
Originally committed as revision 22465 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 08:33:04 +00:00
Martin Storsjö 26cb700c82 RTSP muxer: Create the SDP with the numerical IP of the peer
instead of using the original host name

Originally committed as revision 22464 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 08:24:18 +00:00
David Conrad d8b91fae1d oggdec: Seek to keyframes
Originally committed as revision 22463 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:18:00 +00:00
David Conrad 873d117e4b oggdec: Determine pts and filepos on a packet basis in read_timestamp
This takes into account whether the granule defines the start or end times
of packets, and sets the correct file offset of the associated page.

Originally committed as revision 22462 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:56 +00:00
David Conrad 6abaa27211 oggdec: Move PTS/DTS calculation to a function
Originally committed as revision 22461 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:53 +00:00
David Conrad 2ac41150c0 oggdec: Fix memory leak in setting up vorbis headers
Originally committed as revision 22460 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:49 +00:00
David Conrad 8f8320d7c3 oggdec: Don't use ogg_stream's seq for vorbis or speex headers
Originally committed as revision 22459 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:46 +00:00
David Conrad 77560b0ef1 oggdec: Fix duration calculation for streams with non-zero start
Originally committed as revision 22458 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:43 +00:00
David Conrad 32ad869284 oggdec: Parse skeleton to determine the start time of each stream
Originally committed as revision 22457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:40 +00:00
David Conrad 296bdf9cf1 oggdec: Check that we have a codec in gptopts (needed for skeleton)
Originally committed as revision 22456 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:36 +00:00
David Conrad dfaed51f04 oggdec: Move ogg_find_stream and ogg_gptopts to oggdec.h
(skeleton will need them)

Originally committed as revision 22455 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:33 +00:00
David Conrad 50a9d32310 oggdec: Set data_offset to the right value
Otherwise it gets set automatically to a page midstream and prevents seeking
to the first page.

Originally committed as revision 22454 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:29 +00:00
David Conrad 73823cb941 oggdec: Save offset of the page needed to reconstruct the current packet
Originally committed as revision 22453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-11 07:17:24 +00:00
Martin Storsjö 594a9aebbe Make the ntp_time function available to other parts of libavformat, as ff_ntp_time
Originally committed as revision 22438 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-10 22:21:39 +00:00