Commit Graph

91 Commits

Author SHA1 Message Date
Anton Khirnov ff1ec0c3f8 avio: undeprecate av_url_read_fseek/fpause under nicer names
It seems their replacements won't be ready anytime soon.
2011-04-12 19:17:05 +02:00
Anton Khirnov acaceca2f1 asfdec: remove a forgotten declaration of nonexistent function 2011-04-08 07:08:12 +02:00
Vladimir Pantelic 4377fafda1 asfdec: also subtract preroll when reading simple index object
This was missed when ASF was changed to return timestamps
without preroll.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-23 13:46:19 +00:00
Anton Khirnov 933e90a69a avio: make av_url_read_fseek/fpause internal.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-21 14:54:52 -04:00
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Vladimir Pantelic de11ee906e asfdec: subtract the preroll value and thus output 0 based timestamps
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-17 16:25:54 +00:00
Anton Khirnov 45a8a02a41 lavf: replace avio_seek(SEEK_CUR) with avio_skip where it makes sense
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-16 22:24:51 -04:00
Anton Khirnov 3e68b3ba7b avio: deprecate url_ferror
AVIOContext.error should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-15 08:04:28 -04:00
Anton Khirnov 66e5b1df36 avio: deprecate url_feof
AVIOContext.eof_reached should be used directly instead.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-07 17:20:31 -05:00
Anton Khirnov a2704c9712 avio: add avio_tell macro as a replacement for url_ftell
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-04 11:26:57 -05:00
Anton Khirnov e356fc57a2 lavf: replace all uses of url_fskip with avio_seek
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-01 12:22:16 -05:00
Anton Khirnov 6b4aa5dac8 avio: avio_ prefix for url_fseek
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-03-01 12:12:33 -05:00
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>
2011-02-21 11:23:22 -05:00
Anton Khirnov ae628ec1fd avio: rename ByteIOContext to AVIOContext.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-20 08:37:15 -05:00
Mans Rullgard aabc2682fc asfdec: fix build for big endian targets
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-13 22:10:45 +00:00
Anton Khirnov 5cbd3b5d91 asfdec: don't export empty metadata
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-13 16:49:39 -05:00
Anton Khirnov 8bf6db1b29 asfdec: split reading stream properties out of asf_read_header()
This contains a rename from gsize->size

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-13 16:49:39 -05:00
Anton Khirnov 0b1d291a71 asfdec: deobfuscate reading video properties size
This code will be later split out into a function which takes a 'size'
argument, so I'm keeping the name 'sizeX' here.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-10 18:05:01 -05:00
Anton Khirnov c1fea23070 asfdec: split asf_read_header()
Only trivial splits are done here -- i.e. copy/paste + reindent +
missing variable declarations.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-10 18:03:32 -05:00
Anton Khirnov d7a5106eb2 asfdec: skip the stream bitrate list
Its contents aren't used for anything.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-10 07:03:49 -05:00
Anton Khirnov 7c7253802b asfdec: use an ASFContext array for storing stream bitrates
This will be useful for splitting asf_read_header()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-09 22:26:03 -05:00
Anton Khirnov d42b09723e asfdec: move DAR list to ASFContext
This will be useful for splitting asf_read_header()

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-09 22:26:00 -05:00
Anton Khirnov 569ff02168 asfdec: remove some write-only values from the context
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-09 22:41:30 +00:00
Anton Khirnov 4bc328a2bd asf: split ASFContext into muxer and demuxer parts.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-09 15:31:09 -05:00
Anton Khirnov e4e234fad7 asf: make ff_guidcmp inline and move it to asf.h
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-09 12:33:05 +00:00
Luca Barbato dfd2a005eb Replace dprintf with av_dlog
dprintf clashes with POSIX.1-2008
2011-01-29 23:55:37 +01:00
Anton Khirnov 042950542d asfdec: ensure that the whole tag is read.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-28 21:33:45 +01:00
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.
2011-01-26 22:10:09 +00:00
Anton Khirnov 2934cd9dbf asfdec: remove some commented-out cruft
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25 21:48:03 +01:00
Anton Khirnov 93b78d1210 lavf: make a variant of ff_get_str16_nolen public
It will be useful in mp3 demuxer and hopeful some other places.

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25 21:48:03 +01:00
Peter Ross a750050f4c make guid utility function visibile to other modules (ff_guidcmp, ff_get_guid)
Originally committed as revision 26093 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-26 01:26:29 +00:00
Reimar Döffinger bf09a01981 Change ASF demuxer to return incomplete last packets.
Whether the behaviour for streams using scrambling makes sense
is unclear.

Originally committed as revision 26053 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-18 13:18:52 +00:00
Reimar Döffinger 4172951ba7 Return an error when get_buffer reads none or only partial data instead
of returning packets with uninitialized data.
Returning partial packets as for other demuxers is problematice due to
packet scrambling and thus is not done.

Originally committed as revision 25931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-11 21:41:47 +00:00
Reimar Döffinger 3c3ef81b9b Ensure that packets returned from ASF demuxer are properly 0-padded.
Originally committed as revision 25930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-11 21:39:08 +00:00
Stefan Gehrer 77b7c334be skip top-level objects to search for the simple index in ASF files
Originally committed as revision 25863 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-03 07:49:07 +00:00
Anton Khirnov ad7768f4c4 add ff_ prefix to metadata_conv()
patch by Anton Khirnov  anton _at_ khirnov _dot_ net

Originally committed as revision 25505 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-16 13:20:41 +00:00
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
2010-10-15 19:04:25 +00:00
Stefano Sabatini b9f9e59afc Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the
corresponding AVMEDIA_TYPE_* symbols.

Originally committed as revision 25201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 23:27:16 +00:00
Carl Eugen Hoyos b7d56a17ae Fix indentation after r25158.
Originally committed as revision 25160 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-23 09:53:26 +00:00
Richard Buteau 6ac6e3d123 Fix aspect ratio for files that have it stored in
ff_asf_extended_content_header.
Fixes issue 690.

Patch by Richard Buteau, rbuteau rgbnetworks com

Originally committed as revision 25158 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-23 03:40:06 +00:00
Martin Storsjö d970ec7554 asfdec: 10l, fix the minimum asf video stream header size
This fixes the regression test breakage.

Originally committed as revision 24354 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 13:08:10 +00:00
Martin Storsjö fed7959271 asfdec: Don't read the video stream header if there isn't enough data
Originally committed as revision 24352 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 11:52:29 +00:00
Martin Storsjö a3ab7c3249 asfdec: Handle asf_jfif_media
Originally committed as revision 24351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 11:50:57 +00:00
Måns Rullgård 8fc0162ac4 Add av_ prefix to bswap macros
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 22:12:30 +00:00
Michael Niedermayer 3124766959 Ignore extradata & w/h in asf/dvr.
The w/h values are wrong and extradata contains a fake seq header that causes
decoding to fail later, a valid seq header is in the stream itself.
Partially fixes issue658

Originally committed as revision 24082 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-07 10:39:05 +00:00
Måns Rullgård 30cdfb49b4 asfdec: ensure number of streams is within bounds; remove VLA in asf_read_pts()
Originally committed as revision 23756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-24 15:10:06 +00:00
Michael Niedermayer 1d4c1c3b7a Continue after guids in asf after which other guids are possible instead of skiping
over the stored size.
Fixes issue2029

Originally committed as revision 23732 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-23 02:04:55 +00:00
Alex Converse 1ed87f800f Parse and repack the first frame of H.264 in ASF because SPS+PPS lives in its own packet.
Originally committed as revision 23333 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-26 04:22:52 +00:00
Michael Niedermayer cb0061d453 Favor chunk size over hitting the correct position after reading the chunk size in asf.
Fixes issue1923

Originally committed as revision 23040 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-07 08:08:09 +00:00
Stefano Sabatini 2ef6c1242a Mark av_metadata_set() as deprecated, and use av_metadata_set2()
in its place.

av_metadata_set() is going to be dropped at the next major bump.

Originally committed as revision 22961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-25 14:27:42 +00:00