1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-18 03:19:31 +02:00
Commit Graph

193 Commits

Author SHA1 Message Date
Vasyl' Vavrychuk
e5e3897b64 mpegts: remove get_pts duplicate of ff_parse_pes_pts.
Signed-off-by: Vasyl' Vavrychuk <vvavrychuk@gmail.com>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 665132e620)
2011-01-31 18:25:44 +01:00
Luca Barbato
9ef5a9deaf Replace dprintf with av_dlog
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb)
2011-01-30 03:41:48 +01:00
Diego Elio Pettenò
66355be3c3 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.
(cherry picked from commit c6610a216e)
2011-01-28 03:15:34 +01:00
Georgi Chorbadzhiyski
d7b219ca96 Set service_provider and service_name in mpegts demuxer
Set service_provider and service_name in mpegts demuxer, previously
name and provider_name were set but since the muxer uses service_provider
and service_name use them.

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e8315e7881)
2011-01-21 20:36:00 +01:00
Peter Ross
cc9038e95c add ff_parse_mpeg2_descriptor; make MPEG2 descriptor parsing routines available to other modules.
Originally committed as revision 26125 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-29 12:45:31 +00:00
Baptiste Coudurier
74f726209f In ts demuxer, if pes packet size is < ts packet, honor pes packet and skip padded data.
Fixes issue #2392.

Originally committed as revision 25841 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-29 03:43:56 +00:00
Stephen D'Angelo
c538eb51c6 In TS demuxer, create the AVStream during pmt parsing if the pes stream does not
yet have it, this can happen if the pes stream contain data but no pes header
has been encoutered yet.
Patch by Stephen D'Angelo, SDAngelo at evertz dot com.

Originally committed as revision 25823 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-25 00:55:02 +00:00
Baptiste Coudurier
b795ff97e5 In TS demuxer, keep the pmt filter open to parse all pmt sections,
based on patch by Stephen D'Angelo, SDAngelo at evertz dot com.

Originally committed as revision 25822 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-25 00:29:44 +00:00
Baptiste Coudurier
8ee764b020 Remove some warnings
Originally committed as revision 25808 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-23 01:10:21 +00:00
Baptiste Coudurier
175272cb07 10l, fix memleak, forgot to free mp4_dec_config_descr
Originally committed as revision 25807 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-23 01:04:49 +00:00
Baptiste Coudurier
798c6facb7 In ts demuxer, support aac flexmux using extradata in iods, issue #2346
Originally committed as revision 25806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-23 00:51:12 +00:00
Janne Grunau
915bfa33d1 mpegts: support LATM syntax
Originally committed as revision 25643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-02 08:32:33 +00:00
Aurelien Jacobs
54036be11a rename LAVF_API_* defines to FF_API_* to clarify that it is not public API
Originally committed as revision 24825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-18 20:34:31 +00:00
Aurelien Jacobs
072e3efd1b add LAVF_API_MAX_STREAMS define to disable the deprecated MAX_STREAMS API
Originally committed as revision 24817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 19:30:21 +00:00
Aurelien Jacobs
6b2b337657 get rid of MAX_STREAMS limit in mpegts
Originally committed as revision 24753 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-09 23:21:08 +00:00
Martin Storsjö
8dd25c52cb mpegts: Warn if unable to seek back
Originally committed as revision 24477 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-24 08:43:52 +00:00
Reimar Döffinger
b834becdae Pass the composition and ancillary ID for DVB subtitles via extradata instead
of sub_id, this allows detecting when that information is not available and
just decode everything.
In addition extradata is required for many codecs and thus in contrast to
sub_id generally already passed on by any programs using libav*.
Also ask for a sample if we encounter a stream with multiple/changing IDs.

Originally committed as revision 24238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-14 17:28:40 +00:00
Måns Rullgård
49bd8e4b84 Fix grammar errors in documentation
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
Janne Grunau
b74f67eb17 In ts demuxer, output pes packet as soon as they are complete.
This is needed for subtitles where packets are infrequent.
Patch by Janne Grunau, janne-ffmpeg at jannau dot net.

Originally committed as revision 23157 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-05-18 17:28:07 +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
Baptiste Coudurier
0403c2e3e4 Disable LATM AAC in mpegts, this is not supported and produce too many
bug reports. Also warn the user about it.

Originally committed as revision 22947 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-22 20:34:30 +00:00
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
2010-03-30 23:30:55 +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
Stefano Sabatini
4837bb52d2 Replace last occurrence of the deprecated match_ext() with
av_match_ext().

Originally committed as revision 22351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-08 23:46:04 +00:00
Måns Rullgård
0694a009b6 Fix build
Originally committed as revision 21602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 23:30:30 +00:00
Alexis Ballier
9125806e34 Fix warnings about implicit function declaration when compiling rtpdec.c
Patch by Alexis Ballier, alexis D ballier A gmail

Originally committed as revision 21601 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 23:10:04 +00:00
Baptiste Coudurier
10061cd648 remove useless type declarations
Originally committed as revision 21206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-13 22:52:22 +00:00
Baptiste Coudurier
609d864611 move code to avoid forward declaration
Originally committed as revision 20475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-08 03:27:58 +00:00
Baptiste Coudurier
b3f9f7a333 Let pmt override stream info when encoutered later in the ts file.
Do not set codec id based on pes start code, this is unreliable.
Fix gazeta-20090408-1456-aa.ts

Originally committed as revision 20474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-08 03:17:08 +00:00
Carl Eugen Hoyos
28f008a9d3 Support some LATM AAC streams (they can be decoded with MPlayer).
Originally committed as revision 20472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-07 23:44:56 +00:00
Francesco Lavra
e58992e41f Support demuxing teletext in DVB streams.
Original patch by Francesco Lavra, francescolavra interfree it

Originally committed as revision 20414 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-29 10:46:16 +00:00
Baptiste Coudurier
45a49840f3 handle_packets takes number of packets as arg, avoid reading too much
Originally committed as revision 20288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 20:11:32 +00:00
Baptiste Coudurier
1303d62d84 Increase max resync size, fix demuxing of dvgrab-2009.03.28_19-07-22.m2t
Print error when max resync size is reached and return EAGAIN instead of
INVALIDDATA, so user can retry if wanted.

Originally committed as revision 20286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-18 20:08:13 +00:00
Carl Eugen Hoyos
0096d766b9 Allow demuxing of E-AC3 (stream type 0x84) in MPEG-TS.
Originally committed as revision 20200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-10 21:17:52 +00:00
Ian Caulfield
63380b5e54 Allow the combined TrueHD/AC3 tracks on Blu-Ray discs to be demuxed as two separate streams.
Patch by Ian Caulfield, ian D caulfield A gmail

Originally committed as revision 20168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-05 08:38:39 +00:00
Baptiste Coudurier
8bb7dda2f7 ensure pes buffer is set to avoid segv
Originally committed as revision 19836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-13 20:08:47 +00:00
Baptiste Coudurier
8956f68014 reset pes state to skip after flushing, avoid segv with dvgrab-2009.03.28_19-07-22.m2t
Originally committed as revision 19835 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-13 20:06:49 +00:00
Ivan Schreter
af8aae3fa3 disable new seeking code in mpeg-ts per #ifdef (use old read_seek by default)
Originally committed as revision 19788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-06 15:59:32 +00:00
Ivan Schreter
608be2acef Cosmetic changes in read_seek* routines.
Originally committed as revision 19723 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-26 22:33:48 +00:00
Christian Schmidt
5dd3707b8d Decoder for LPCM as used in Bluray discs.
Patch by Christian Schmidt, schmidt digadd de

Originally committed as revision 19722 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-26 22:10:35 +00:00
Stephen Backway
c58b82a29b Add Bluray Subtitle Support
Patch by Stephen Backway, stev391 A exemail D com D au

Originally committed as revision 19699 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-25 08:47:39 +00:00
Måns Rullgård
cf5ec60740 mpegts: change variable-length array to fixed length
The difference between 188 and 204 is not worth worrying about.

Originally committed as revision 19697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-24 21:42:25 +00:00
Ivan Schreter
a8dd8dc6e9 Use generic multi-stream key frame finding routine to implement read_seek2 and map
read_seek to read_seek2.

Originally committed as revision 19681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-22 16:07:50 +00:00
Baptiste Coudurier
0fd7cf116b init pes dts and pts to AV_NOPTS_VALUE, fix issue #1297
Originally committed as revision 19546 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-30 18:29:06 +00:00
Baptiste Coudurier
d46c84ea31 Stop parsing in read_header only after finding pmt, and
do not close pat filter so further pmt can be parsed.
Fix issue #1294.

Originally committed as revision 19530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-07-29 02:17:08 +00:00
Baptiste Coudurier
d23612efe1 Only set CODEC_ID_PROBE when a packet from a stream having a PES header
is read.

Originally committed as revision 19273 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-25 19:01:16 +00:00
Wolfram Gloger
896f2b3212 add 0-termination in table, patch by Wolfram Gloger, wmglo at dent dot med dot uni-muenchen dot de
Originally committed as revision 19229 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-20 06:09:30 +00:00
Baptiste Coudurier
b2984add80 do not parse full header for private streams
Originally committed as revision 19075 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-02 07:53:44 +00:00
Baptiste Coudurier
617c461625 correctly handle maximum streams limit
Originally committed as revision 19074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-02 07:30:19 +00:00
Baptiste Coudurier
1c4df2ab24 export data from private streams
Originally committed as revision 19073 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-02 07:26:58 +00:00