1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Commit Graph

236 Commits

Author SHA1 Message Date
Nico Sabbi
a45b40c496 treat stream_type==0x82 as AUDIO_DTS when the program has a REGISTRATION_DESCRIPTOR with the value HDMV; approved by Mans
Originally committed as revision 12180 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-23 10:57:38 +00:00
Aurelien Jacobs
3abe5fbdc4 improve CRC API
- don't export any global var
 - provide either generated or hardcoded tables

Originally committed as revision 11409 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-01-04 23:09:58 +00:00
Björn Axelsson
899681cd1d Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007

Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-21 07:41:00 +00:00
Jeff Downs
28af284cfb When new streams are detected, look for old filters and close them out.
This avoids crashes seen when legitimate streams are found on PID 0x11 instead
of DVB SDT.
Fixes regression detailed in Roundup issue 138.

Originally committed as revision 11050 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-17 03:14:43 +00:00
Nico Sabbi
aa237f4535 associate to each AVProgram the indexes of the AVStreams contained in it
Originally committed as revision 10820 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-20 08:29:05 +00:00
Nico Sabbi
172d1171d2 added structures and code to keep track of pids<->programs mapping: it's needed
to decide which pids to discard in order to feed to the caller only AVProgram(s)
that have the AV_DISCARD_ALL flag not set

Originally committed as revision 10581 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-25 20:58:37 +00:00
Nico Sabbi
1d257254f1 replaced custom tracking of programs/services with calls to with av_new_program()
Originally committed as revision 10580 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-25 20:49:11 +00:00
Aurelien Jacobs
6369638bf0 loosen dependencies over allformats.h
Originally committed as revision 10513 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-09-16 23:00:44 +00:00
Panagiotis Issaris
6f3e0b2174 Replace all occurrences of AVERROR_IO with AVERROR(EIO).
Originally committed as revision 9760 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-19 15:23:32 +00:00
Alex Beregszaszi
5b83843f43 fix compilation with assert
Originally committed as revision 9619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-13 00:49:40 +00:00
Måns Rullgård
b474d1f3fa update SectionCallback and PESCallback typedefs to match functions
Originally committed as revision 9542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-08 13:42:51 +00:00
Ronald S. Bultje
80fb82346e Use AV_RB* macros where appropriate.
patch by Ronald S. Bultje, rsbultje gmail com
thread: Re: [FFmpeg-devel] remove int readers
date: Sat, 23 Jun 2007 09:32:12 -0400

Originally committed as revision 9499 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-06 09:32:34 +00:00
Michael Niedermayer
b3e104366a simplify
Originally committed as revision 9258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-08 17:34:37 +00:00
Michael Niedermayer
2bb486a5e6 remove now unused "global" pcr_pid
Originally committed as revision 9257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-08 17:26:05 +00:00
Michael Niedermayer
dbf6b678fc proper per stream pcr_pid support by (Wolfram Gloger wmglo dent.med.uni-muenchen@de )
Originally committed as revision 9256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-08 17:21:29 +00:00
Michael Niedermayer
e39291dfcf partially revert r2931 (Support raw mpegts streams from dvr)
the change was wrong

Originally committed as revision 9219 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 22:23:05 +00:00
Michael Niedermayer
04ec18b8b3 harmless typo
Originally committed as revision 9210 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 14:54:33 +00:00
Michael Niedermayer
28f03d0494 fix indention
Originally committed as revision 9209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 14:53:47 +00:00
Michael Niedermayer
ad39abcdd9 remove duplicate PAT scaning code and actual PAT scan
also disabling the nonsense 3yr old rawts change (it would after the
above chage totally break the demuxer if its left enabled)

Originally committed as revision 9208 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 14:44:52 +00:00
Michael Niedermayer
4dc8a963d1 unused variables
Originally committed as revision 9207 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 14:20:07 +00:00
Michael Niedermayer
90d13e30d5 dont rescan for information on each pid, but rather do it just once by
opening 1 filter for each at the same time

Originally committed as revision 9206 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 14:17:43 +00:00
Michael Niedermayer
ecc31d1d8e move structs and enums to top of file so they can be used
Originally committed as revision 9205 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 14:11:54 +00:00
Michael Niedermayer
4d9a577e30 passing MpegTSFilter to the filters instead of a random void *opaque
code is simler and the filters now know the pid they are filtering so one
filter callback can be used with more then one pid at the same time

Originally committed as revision 9204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 13:57:00 +00:00
Michael Niedermayer
37dfd6333d do not perform SDT scan at the begin (this avoids a timeconsuming search for
optional info) instead fill SDT info in and update it as we stumble across it

Originally committed as revision 9201 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 12:19:38 +00:00
Michael Niedermayer
657ced8cdb make new_service() update existing info sanely
Originally committed as revision 9200 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 11:46:59 +00:00
Michael Niedermayer
0618bb1c5b remove fake service/provider names used for PAT
this allows us to distingush if the info came from SDT or PAT and will
allow to dyamically fill info in ...

Originally committed as revision 9199 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 11:25:33 +00:00
Benoit Fouet
a45ec41409 Indentation
Originally committed as revision 9197 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-04 08:53:08 +00:00
Michael Niedermayer
b91811af83 get rid of if(1)
Originally committed as revision 9179 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-02 23:14:38 +00:00
Michael Niedermayer
9deb6d71b8 get rid of one layer of callback obfuscation
Originally committed as revision 9178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-02 23:11:17 +00:00
Michael Niedermayer
b229219417 kill completely idiotic code which hides all but 2 streams
Originally committed as revision 9177 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-02 23:04:46 +00:00
Michael Niedermayer
165f503a27 correct implementation of "try with auto_guess if first detection fails"
(untested)

Originally committed as revision 9175 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-02 21:48:49 +00:00
Michael Niedermayer
d287b04b6d revert r4802 (try with auto_guess if first detection fails)
this change is broken, 3/4 of the code added is unreachable, ill implement
it correctly in a moment

Originally committed as revision 9174 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-02 21:44:20 +00:00
Michael Niedermayer
38c48be213 split mpeg2ts_raw mode into its own demuxer using such a flag is an incredibly dirty hack
Originally committed as revision 9173 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-02 20:57:31 +00:00
Glenn A. Serre
828bb5f1f6 variable initialization (because of a gcc warning)
patch by Glenn A. Serre gaserre spiresoftware com

Originally committed as revision 9146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-29 08:19:37 +00:00
Aurelien Jacobs
57004ff1d7 add an enum for need_parsing
Originally committed as revision 8742 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-15 13:51:57 +00:00
Panagiotis Issaris
750f0e1f8b Introduce two new logging functions av_hex_dump_log() and av_pkt_dump_log()
which use av_log() for logging instead of fprintf().

Originally committed as revision 8339 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-12 14:17:26 +00:00
François Revol
8fa36ae09d This fixes error handling for BeOS, removing the need for some ifdefs.
AVERROR_ defines are moved to avcodec.h as they are needed in there as well. Feel free to move that to avutil/common.h.
Bumped up avcodec/format version numbers as though it's binary compatible we will want to rebuild apps as error values changed.
Please from now on use return AVERROR(EFOO) instead of the ugly return -EFOO in your code.
This also removes the need for berrno.h.

Originally committed as revision 7965 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-13 18:26:14 +00:00
Nico Sabbi
cf10ee184f demux VC1 in mpegts
Originally committed as revision 7902 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-09 20:34:24 +00:00
Michel Bardiaux
f0ee3ea619 Add some context to av_log calls.
patch by Michel Bardiaux, mbardiaux mediaxim be

Originally committed as revision 7774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-31 08:29:24 +00:00
Daniel Kristjansson
e995cfca28 mpegts-documentation-only.patch -- adds documentation patch by Daniel Kristjansson / danielk mrl.nyu edu
yes another 1 year old patch, this one though has one failed hunk

Originally committed as revision 7676 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 21:47:32 +00:00
Daniel Kristjansson
2ddb79befd "converts printf's to avlog's" patch by Daniel Kristjansson / danielk mrl.nyu edu
another 1 year old patch forgoten by mans
trailing whitespace removial by me

Originally committed as revision 7674 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 21:41:30 +00:00
Måns Rullgård
1ed1a122a7 make some symbols static
Originally committed as revision 6973 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-11-11 20:56:36 +00:00
Aurelien Jacobs
7fbde3431a replace coder/decoder file description in libavformat by muxer/demuxer
Originally committed as revision 6774 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-23 08:57:54 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Nico Sabbi
ec6913d267 scan s->probesize packets instead of MAX_SCAN_PACKETS (that is still the default value)
Originally committed as revision 6110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-08-27 12:22:40 +00:00
Måns Rullgård
ff70e60176 allow individual selection of muxers and demuxers
Originally committed as revision 5707 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-10 21:14:37 +00:00
Måns Rullgård
d2a067d1d9 give AVInput/OutputFormat structs consistent names
Originally committed as revision 5697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-09 23:40:53 +00:00
Nico Sabbi
2eb1a65d91 Etsi identifies DTS audio with stream_private+descriptor 0x7b (in the PMT).
This patch permits to recognize these streams but it's untested for
lack of samples.

Patch by Nico Sabbi <nicola_sabbi at fastwebnet it>

Originally committed as revision 5671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-08 16:25:45 +00:00
Stefan Huehner
7b49ce2e34 Add const to (mostly) char* and make some functions static, which aren't used
outside their declaring source file and which have no corresponding prototype.
patch by Stefan Huehner stefan^^@^^huehner^^.^^org

Originally committed as revision 5497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-18 11:33:14 +00:00
Måns Rullgård
9d9b432ae9 This patch simply adds demuxing support for AC-3 streams in DVB TS
files.  In these streams AC-3 is given type 0x06 (private stream) and
includes a descriptor with either tag 0x6A or 0x7A.  The code already
handles ATSC AC-3 which uses stream type 0x81.  All the new patch does
is look for any stream type 0x06 that has a descriptor with the proper
tag (i.e. 0x6A or 0x7A) and if found forces it to be recognized as an
AC-3 stream.
From Andy Brown <abrown at daqtron com>

Originally committed as revision 5260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-01 19:02:40 +00:00
Måns Rullgård
00a6b92bdd fix memory leak on mpegts close
found by Andy Brown <abrown at daqtron com>

Originally committed as revision 5259 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-01 18:19:00 +00:00
Michael Niedermayer
43a80ccee5 generic crc calculation code
Originally committed as revision 5115 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-03-06 14:13:01 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Nico Sabbi
27c748b576 try with auto_guess if first detection fails
Originally committed as revision 4802 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-02 20:27:15 +00:00
Nico Sabbi
5d4d67e0ff added support for DVHS (192) packet size
Originally committed as revision 4801 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-02 20:13:24 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Diego Biurrun
a9e3509529 Replace CONFIG_ENCODERS/CONFIG_DECODERS with CONFIG_MUXERS/CONFIG_DEMUXERS
in libavformat to allow building (de)coders and (de)muxers independently at
some point + support for this option in configure.

Originally committed as revision 4611 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-23 00:25:41 +00:00
Måns Rullgård
79396ac685 Kill some compiler warnings. Compiled code verified identical after changes.
Originally committed as revision 4567 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-09-06 21:25:35 +00:00
Michael Niedermayer
01f4895c68 changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility
Originally committed as revision 4453 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-17 22:24:36 +00:00
Michael Niedermayer
c6ec28b18c DVB subtitle decoder by (Ian Caulfield: imc25, cam ac uk)
Originally committed as revision 4448 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-07-17 00:28:12 +00:00
Michael Niedermayer
2692067a45 AVPacket.pos
Originally committed as revision 4314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-26 20:17:12 +00:00
Wolfram Gloger
415264045f Correct number of bits for PTS.
Patch by Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>

Originally committed as revision 4188 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-05-06 16:14:29 +00:00
Michael Niedermayer
c0df9d75bd switch to native time bases
Originally committed as revision 4168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-04-30 21:43:59 +00:00
Wolfram Gloger
27bb1ed348 Writing to freed memory in write_section_data() patch by (Wolfram Gloger <wmglo dent dot med dot uni-muenchen de>)
Originally committed as revision 3957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-16 23:04:11 +00:00
Michael Niedermayer
3ba1438dec use native timebase for seeking
direction flag for seeking

Originally committed as revision 3577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-10 22:05:43 +00:00
Michael Niedermayer
23c9925329 libdts support by (Benjamin Zores <ben at geexbox dot org>)
Originally committed as revision 3310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-07-14 01:32:14 +00:00
Michael Niedermayer
e05655fbbd fix playback of http://www.zonque.org/test-long.ps
better seeking, (not to keyframes but at least to the start of packets ...)

Originally committed as revision 3182 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-31 16:57:00 +00:00
Michael Niedermayer
cdd5034f89 store index for seeking in the native timebase of each stream
set correct timebase for nut
merge mpeg-ts seeking with existing seeking code
10l fix in mpegts (27mhz vs. 90khz)

Originally committed as revision 3152 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-23 16:26:12 +00:00
Michael Niedermayer
9ee91c2f53 move time_base (pts_num/pts_den) from AVFormatContext -> AVStream
Originally committed as revision 3148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-05-21 20:43:21 +00:00
Wolfram Gloger
550f0a9b07 Off-by-two in mpegts.c patch by (Wolfram Gloger <wmglo at dent dot med dot uni-muenchen dot de>)
Originally committed as revision 3011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-04-13 13:33:02 +00:00
Wolfram Gloger
6fb316d563 Support raw mpegts streams from dvr patch by (wmglo at dent dot med dot uni-muenchen dot de)
Originally committed as revision 2931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-03-26 17:40:40 +00:00
Gildas Bazin
2092bd7531 avsync patch by (Gildas Bazin <gbazin at altern dot org>)
Originally committed as revision 2805 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-02-20 14:39:15 +00:00
Gildas Bazin
ec7d0d2e9e memleak patch by (Gildas Bazin <gbazin at altern dot org>)
Originally committed as revision 2678 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-01-08 19:01:16 +00:00
Michael Niedermayer
a0b8f70c29 better get_packet_size and probe
Originally committed as revision 2578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-09 00:17:43 +00:00
Måns Rullgård
278de4755d support more codecs in MPEG-TS patch by (mru at kth dot se (Måns Rullgård))
Originally committed as revision 2511 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-12 21:56:57 +00:00
Fabrice Bellard
27f388aa24 seek support
Originally committed as revision 2501 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-11-10 18:47:52 +00:00
Fabrice Bellard
b45a7a18d3 mpeg TS demux API (called from RTP layer) - raw mpeg TS reader (uses fake codec MPEG2TS)
Originally committed as revision 2446 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-29 14:16:31 +00:00
Doug Larrick
66535069da Enable decoding of more mpeg-ts streams for pcHDTV patch by (Doug Larrick <doug at ties dot org>)
Originally committed as revision 2390 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-15 18:06:44 +00:00
Mike Melanson
764ef40015 disable encoders where appropriate (patch courtesy of BERO
<bero -at- geocities.co.jp>)

Originally committed as revision 2375 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-10-14 04:15:53 +00:00
Fabrice Bellard
fc48fe84a9 cosmetic change in resync code - added PAT scanning code if no SDT is found (in the futur it would be interesting to give an API to change channel - also useful for DV input number or TV grab tunning
Originally committed as revision 2043 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-15 13:21:39 +00:00
Isaac Richards
ec23a47286 - Looks a tiny bit harder in mpegps_probe() for a valid start code. This is
needed to detect some files produced by pvr-250/350 capture cards.
- Adds AC3 audio support to the mpegts demuxer, and makes it a little more
tolerant of bad files.
patch by (Isaac Richards <ijr at po dot cwru dot edu>)

Originally committed as revision 2028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-07-10 09:04:04 +00:00
Michael Niedermayer
ce34182dd7 try to filter _all_ PATs if no SDT could be found patch by (<gbazin at altern dot org>)
+ mpegtsenc.c compile fix by me

Originally committed as revision 1995 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-28 23:44:09 +00:00
Fabrice Bellard
5dbafeb7ba mpeg ts demux uses DVB SI info and generates correct PTS info - added prototype mpeg ts mux
Originally committed as revision 1956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-06-13 14:28:45 +00:00
François Revol
6af6cf22c5 avoid detecting mpeg stream when other formats embed mp3 tracks.
Originally committed as revision 1788 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-18 14:35:15 +00:00
Zdenek Kabelac
0c1a9edad4 * UINTX -> uintx_t INTX -> intx_t
Originally committed as revision 1578 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-02-11 16:35:48 +00:00
Fabrice Bellard
abac617591 renamed libav to libavformat
Originally committed as revision 1276 to svn://svn.ffmpeg.org/ffmpeg/trunk
2002-11-25 19:07:40 +00:00