Laurent Aimar
bc38e83793
mpegts: do not return from ff_mpegts_parse_packet() after having seen the first PMT
...
It prevents leaving the AVPacket uninitialized.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Laurent Aimar
49ec0c818d
mpegts: fix return value when enough ts packets have been parsed or when the first PMT has been seen.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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
Anton Khirnov
3b3bbdd3e6
lavf,lavd: replace av_new_stream->avformat_new_stream part I.
...
Trivial replacements with sed are done in this commit:
sed 's/av_new_stream(\([^)]*\), 0)/avformat_new_stream(\1, NULL)/'
13 years ago
Anton Khirnov
145f741e11
AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*
13 years ago
Michael Niedermayer
b2f88ce21c
mpegts: reduce av_log level for seek back to begin on unseekable protocols to info level.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Petter Ericson
1fb30586cf
mpegts: Attempt to seek back to beginning in non-seekable mpegts files.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Carl Eugen Hoyos
7e75f06182
Be less verbose about continuity check errors.
13 years ago
Diego Biurrun
35a6855868
Fix av_dlog invocations with wrong or missing logging context.
...
This fixes build failures with -DDEBUG in CPPFLAGS.
13 years ago
Michael Niedermayer
e78d1a594a
mpegts: make sure the "standard" code doesnt override the probing with NONE/DATA.
...
Fixes video stream detection in vid_0x80.ts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
elupus
9fa47cb773
make mpegts_get_pcr resync if it's not on a valid mpegts packet
13 years ago
elupus
6214266362
cosmetic reindent of mpegts_get_pcr
13 years ago
elupus
0a90b6a43e
check return value of url_fseek in mpegts_get_pcr
13 years ago
elupus
880e83827f
respect the maximum position mpegts_get_pcr is allowed to seek to
13 years ago
elupus
2130d2f594
remove unused code in mpegts_get_pcr
13 years ago
Joakim Plate
c8ce2b0a1d
mpegts: When playing mpegts over rtp/rtsp/sdp, lavf must still read PAT/SDT to get available streams
...
The code path using for mpegts over rtp doesn't open the demuxer using
mpegts_read_header,
so it never starts listening for PAT/SDT, only uses auto_guess
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Georgi Chorbadzhiyski
f1f15c3c1a
mpegts: improve error reporting
...
When reporting continuity error show pid, expected and received cc.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years ago
Aviad Rozenhek
162f1fbc14
mpegts: on seek, reset the cc for all PIDs
...
Prevent false positive continuity counter error logs.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
13 years ago
Michael Niedermayer
cb66db8010
mpegts: update comment to match code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Joakim Plate
6d40f88cab
mpegts: Some additional HDMV types and reg descriptors for mpegts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Carl Eugen Hoyos
c41bf905f4
Only autodetect loas in transport streams.
...
The Makito encoder sets stream type 0x11 for AAC.
This patch should be reverted if it breaks decoding valid streams (and
the problem can't be fixed in the probe function).
14 years ago
Alex Converse
ad6c7c1b52
mp4: Handle non-trivial ES Descriptors.
14 years ago
Alex Converse
d8b999e2d0
mpegts: log into an AVFormatContext rather than MpegTSContext.
...
MpegTSContext's AVClass member can be NULL.
14 years ago
Anton Khirnov
c14fe6bc99
lavf,lavd: remove all usage of AVFormatParameters from demuxers.
...
AVFormatParameters are converted into corresponding private options in
av_open_input_file/stream() compat wrappers, so accessing them from
demuxers is redundant.
14 years ago
Reimar Döffinger
0399044805
Always pass a AVFormatContext to av_log.
...
This is consistent, allows custom handlers to print more info
(since they probably know about the AVFormatContext class
but not a demuxer-specific one) and also avoids issues due
to the class pointer being NULL for non-raw mpegts.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
14 years ago
Zohar Kelrich
5081514269
mpegts: Mark wrongly-sized packets as corrupted
...
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
14 years ago
Zohar Kelrich
cdb9884a63
mpegts: Move scan test to handle_packets
...
This fixes an issue where packets which start being read
while reading the header stick around after a seek.
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
14 years ago
Zohar Kelrich
ce9e31655e
mpegts: Mark corrupted packets
...
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
14 years ago
Zohar Kelrich
c64f80b0e8
mpegts: Reset continuity counter on seek
...
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
14 years ago
Zohar Kelrich
8b9df201df
mpegts: Fix for continuity counter
...
Make continuity counter respect discontinuity flag
and null packets. Unpack the adaptation_field_control field.
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
14 years ago
Zohar Kelrich
be9c00615b
mpegts: Silence "can't seek" warning on unseekable
...
Do not try to seek when we already know we are not allowed to.
Silences warning that always happens when streaming.
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
14 years ago
Mike Williams
298c4e3c52
mpegts: remove invalid error check
...
mpegts_read_header is used by both mpegts and mpegtsraw, so this
erro check is no longer valid.
Signed-off-by: Mike Williams <mike@mikebwilliams.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Anton Khirnov
dfc2c4d900
lavf: use designated initialisers for all (de)muxers.
...
It's more readable and less prone to breakage.
14 years ago
Jindrich Makovicka
8923cfa328
mpegts: fix Continuity Counter error detection
...
According to MPEG-TS specs, the continuity_counter shall not be
incremented when the adaptation_field_control of the packet
equals '00' or '10'.
Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Diego Biurrun
d3f751e603
Add some missing mathematics.h #includes for av_rescale().
14 years ago
Diego Biurrun
adbfc605f6
doxygen: Consistently use '@' instead of '\' for Doxygen markup.
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
14 years ago
Diego Biurrun
919d7a345a
Replace DEBUG_SEEK/DEBUG_SI + av_log combinations by av_dlog.
14 years ago
Anton Khirnov
d2d67e424f
Remove all uses of now deprecated metadata functions.
14 years ago
Diego Biurrun
43b6c3eb18
mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro.
14 years ago
Diego Biurrun
b751f61106
Remove stray extra arguments from av_dlog() invocations.
14 years ago
Kieran Kunhya
5501afa6ee
Export PCR pid
14 years ago
Kieran Kunhya
24adef142f
Export more transport stream information.
...
with minor addition to the comment by michael
14 years ago
Kieran Kunhya
fa12fb3b00
Output MPEG-TS stream identifiers.
...
with changes by michael to simplify API
14 years ago
Anton Khirnov
fb37d57347
lavf: deprecate AVFormatParameters.mpeg2ts_raw.
...
It doesn't do anything except produce an error message when set.
14 years ago
Anton Khirnov
17a5556db5
mpegts: add compute_pcr option.
...
Deprecate the corresponding AVFormatParameters field.
14 years ago
Baptiste Coudurier
6ae38aa3ce
mpegts: do not output known sized packet if an unbounded packet is already queued.
...
Fix issue #2624 .
Signed-off-by: Anton Khirnov <anton@khirnov.net>
14 years ago
Baptiste Coudurier
9aa91043f3
Port SMPTE S302M audio decoder from FFmbc 0.3.
14 years ago
Reimar Döffinger
5631729c3d
Increase TS packet size detection buffer.
...
Fixes warning message with ticket #68 .
14 years ago
Reimar Döffinger
90f5e991be
Assume some TS packet size instead of failing completely.
...
Fixes ticket #68 .
14 years ago
Diego Biurrun
2e15305b70
Remove some disabled printf debug cruft.
14 years ago