Anton Khirnov
8ad3267ce3
oggdec: do not fall back on binary search in the generic code.
...
Binary search is already attempted in the format-specific seek function,
so the fallback is only reached if binary search failed already.
12 years ago
Luca Barbato
f963f701d9
ogg: relax demuxer conformance checks
...
Some samples in the wild are missing headers that are expected by the
specification but in practice do not affect decoding.
12 years ago
Luca Barbato
d894f74762
oggdec: make sure the private parse data is cleaned up
12 years ago
Luca Barbato
89b51b570d
oggdec: free the ogg streams on read_header failure
...
Plug an annoying memory leak on broken files.
12 years ago
Luca Barbato
ba064ebe48
oggdec: check memory allocation
12 years ago
Luca Barbato
f5f1cf5224
oggdec: K&R cosmetic formatting
12 years ago
Luca Barbato
d1f05dd183
ogg: calculate the start position once all the headers are parsed
...
The fisbone packets can be muxed in any order as long the last one
comes before the first data packet.
12 years ago
Luca Barbato
7751e4693d
ogg: check that the expected number of headers had been parsed
...
Not having the header for a codec is a tell-tale of a broken file.
12 years ago
Dale Curtis
ef0d779706
Fix uninitialized reads on malformed ogg files.
...
The ogg decoder wasn't padding the input buffer with the appropriate
FF_INPUT_BUFFER_PADDING_SIZE bytes. Which led to uninitialized reads in
various pieces of parsing code when they thought they had more data than
they actually did.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
13 years ago
Anton Khirnov
6e9651d106
lavf: remove AVFormatParameters from AVFormatContext.read_header signature
13 years ago
Diego Biurrun
e873c03ac7
misc Doxygen markup improvements
13 years ago
Anton Khirnov
c3f9ebf743
lavf: make av_set_pts_info private.
...
It's supposed to be called only from (de)muxers.
13 years ago
Anton Khirnov
a2faa95151
lavf: make some seeking functions private
...
Specifically av_update_cur_dts(), av_seek_frame_binary() and
av_gen_search().
They are not supposed to be called outside lavf.
13 years ago
Anton Khirnov
84ad31ff18
lavf: replace av_new_stream->avformat_new_stream part II.
...
Manual replacements are done in this commit.
In many cases, the id is some constant made up number (e.g. 0 for video
and 1 for audio), which is then not used in the demuxer for anything.
Those ids are removed.
13 years ago
Nicolas George
4ca59d1948
oggdec: add support for Xiph's CELT codec
...
This patch also introduces CODEC_ID_CELT.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
13 years ago
Laurent Aimar
0e7efb9d23
oggdec: fix out of bound write in the ogg demuxer
...
Between ogg_save() and ogg_restore() calls, the number of streams
could have been reduced.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years ago
Chris Evans
4cc3467e7a
oggdec: prevent heap corruption.
...
Specifically crafted samples can reinit ogg->streams[] while
reading samples, and thus we should not cache old pointers since
these may no longer be valid.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Nicolas George
9cec1bbd14
ogg: propagate return values and return more meaningful error values
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
14 years ago
Reimar Döffinger
0a94020b5b
oggdec: Abort Ogg header parsing when encountering a data packet.
...
Fixes Bugzilla #11 .
Signed-off-by: Diego Biurrun <diego@biurrun.de>
14 years ago
Ronald S. Bultje
9ed6cbc3ee
ogg: fix double free when finding length of small chained oggs.
...
ogg_save() copies streams[], but doesn't keep track of free()'ed
struct members. Thus, if in between a call to ogg_save() and
ogg_restore(), streams[].private was free()'ed, this would result
in a double free -> crash, which happened when e.g. playing small
chained ogg fragments.
14 years ago
Diego Biurrun
b751f61106
Remove stray extra arguments from av_dlog() invocations.
14 years ago
Mans Rullgard
e65ab9d94f
Remove unused variables
14 years ago
Clément Bœsch
e575685fad
Cosmetics: fix prototypes in oggdec
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
14 years ago
Clément Bœsch
5780f41af5
oggdec: fix memleak with continuous streams.
...
This avoids the creation of a new AVStream instead of replacing it when
a stream reset occurs (track change with some webradios for example).
Signed-off-by: Diego Biurrun <diego@biurrun.de>
14 years ago
Clément Bœsch
b3bbc6fdc5
oggdec: use explicit AVInputFormat struct initializers
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
14 years ago
Clément Bœsch
f95257d27c
oggdec: simplify ogg_probe
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
14 years ago
Diego Biurrun
045dd4b928
Replace some commented-out debug printf() / av_log() messages with av_dlog().
14 years ago
Clément Bœsch
dc713546d4
oggdec: reindent after 8f3eebd6
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
14 years ago
Michael Niedermayer
52512d0a43
oggdec: use av_freep() instead of av_free()
...
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Clément Bœsch
8f3eebd663
oggdec: simplify audio chained ogg streams support
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
14 years ago
Clément Bœsch
47dec30edb
oggdec: fix demuxing chained audio streams
...
Chained ogg served by icecast and mpd should demux
properly now.
Fixes issue2337
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
14 years ago
Anton Khirnov
8978fedaee
avio: introduce an AVIOContext.seekable field
...
Use it instead of url_is_streamed and AVIOContext.is_streamed.
14 years ago
Anton Khirnov
66e5b1df36
avio: deprecate url_feof
...
AVIOContext.eof_reached should be used directly instead.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
76aa876e69
avio: avio_ prefix for url_fsize
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
e51975392d
avio: deprecate url_fgetc and remove all it uses
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
a2704c9712
avio: add avio_tell macro as a replacement for url_ftell
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
6b4aa5dac8
avio: avio_ prefix for url_fseek
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
b7effd4e83
avio: avio_ prefixes for get_* functions
...
In the name of consistency:
get_byte -> avio_r8
get_<type> -> avio_r<type>
get_buffer -> avio_read
get_partial_buffer will be made private later
get_strz is left out becase I want to change it later to return
something useful.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Anton Khirnov
ae628ec1fd
avio: rename ByteIOContext to AVIOContext.
...
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
14 years ago
Reimar Döffinger
6bd69e6ada
oggdec: Fix incorrect assumption about header/data interleaving
...
Currently (since the data_offset fix) the ogg demuxer assumes that
after the first non-header packets in any stream no more header packets
will follow.
This is not guaranteed, so change the code back again to wait until it
has finished the headers for all streams before returning from ogg_get_headers.
This fixes issue 2428.
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Diego Elio Pettenò
c6610a216e
Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.
...
This also lists the objects from those two libraries as internal (by adding
the ff_ prefix) so that they can then be hidden via linker scripts.
14 years ago
Aaron Colwell
365d8e471d
Ensure that data_offset is set correctly when there are partial
...
data packets before the first complete one.
Patch by Aaron Colwell [acolwell chromium org].
Originally committed as revision 25846 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Anton Khirnov
03700d399b
Export metadata in the generic format. Deprecate old conversion API.
...
patch by Anton Khirnov anton _at_ khirnov _dot_ net
Originally committed as revision 25493 to svn://svn.ffmpeg.org/ffmpeg/trunk
14 years ago
Eli Friedman
461628c6a8
Fix printf format warnings
...
patch by Eli Friedman <eli dot friedman at gmail dot com>
Originally committed as revision 23547 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Reimar Döffinger
f1a0518524
Enable AVFMT_GENERIC_INDEX for Ogg demuxer. This avoids the many
...
seeks needed for binary search when seeking to a previously seen
location.
Originally committed as revision 23279 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
David Conrad
adc725b558
oggdec: Move warning about missing granule to the correct place
...
Originally committed as revision 22891 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
David Conrad
44a088eab7
oggdec: Fix duration calculation if the last page in a file has no granule
...
Originally committed as revision 22890 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
David Conrad
49c2d29089
oggdec: Remove write-only variable
...
Originally committed as revision 22889 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Jean-Daniel Dupas
cc947f04cc
Replace all occurences of PKT_FLAG_KEY with AV_PKT_FLAG_KEY.
...
Patch by Jean-Daniel Dupas, devlists shadowlab org
Originally committed as revision 22744 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Stefano Sabatini
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago