generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
36,187 Commits 24 Branches 241 Tags 173 MiB
2613de8805
Commit Graph

273 Commits

Author SHA1 Message Date
Michael Niedermayer
41540b36a1 bitstream: add get_bits64() to support reading more than 32 bits at once 
Also remove a duplicate function in the MPEG-TS demuxer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-12-07 16:15:02 -05:00
Diego Biurrun
15d35bee83 mpegts: Drop pointless casting of hex_dump_debug arguments 2012-10-01 13:18:28 +02:00
Diego Biurrun
72eaba5e4f avformat: Convert some commented-out printf/av_log instances to av_dlog 2012-10-01 10:24:28 +02:00
Christian Schmidt
07584eaf4a mpegts: check substreams before discarding 
Allow to extract the AC3 core from TrueHD with the "copy" codec.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-09-12 23:43:53 +02:00
Martin Storsjö
e6153f173a avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-04 23:13:44 +03:00
Anton Khirnov
36ef5369ee Replace all CODEC_ID_* with AV_CODEC_ID_* 2012-08-07 16:00:24 +02:00
Diego Biurrun
0177b7d23a Improve descriptiveness of a number of codec and container long names 2012-07-30 20:46:55 +02:00
Ronald S. Bultje
ae2bb52cd2 mpegts: remove unused/incomplete/broken seeking code 2012-06-19 00:56:43 +01:00
Alex Converse
a8656cd425 mpegts: Remove disabled extension matching probe. 2012-06-07 12:27:04 -07:00
Joakim Plate
68b9ed8391 mpegts: Some additional HDMV types and reg descriptors for mpegts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-05-03 12:13:28 -04:00
Martin Storsjö
df8aa4598c mpegts: Make sure we don't return uninitialized packets 
This fixes crashes, where the demuxer could return 0 even
if the returned AVPacket isn't initialized at all. This
could happen if running into EOF or running out of probesize
with non-seekable sources.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-04-27 20:05:37 +03:00
Martin Storsjö
269cb6751b mpegts: Try seeking back even for nonseekable protocols 
The mpegts demuxer reads 5 KB at startup just for discovering
the packet size. Since the default avio buffer size is 32 KB,
the seek back to the start will in most cases be within the
avio buffer, and will in most cases succeed even if the actual
protocol isn't seekable.

This makes the demuxer startup faster/with less data when
reading data from a non-seekable input, by not skipping
the first few KB.

If it fails, don't warn if the protocol isn't seekable, making
it behave as before in the failure case.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-04-23 00:02:49 +03:00
Martin Storsjö
20234a4bd7 cosmetics: Align muxer/demuxer declarations 
Also add missing trailing commas, break long codec_tag lines and
add spaces in codec_tag declarations.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-04-06 19:19:59 +03:00
Alex Converse
c9024a9fd7 mpegts: Fix dead error checks 2012-03-26 17:53:51 -07:00
Alex Converse
100c3fb2d1 mpegts: Always honor a registration descriptor if present and there is no other codec information. 2012-03-09 09:48:14 -08:00
Alex Converse
1aa708988a mpegts: Pad the packet buffer in handle_packet(). 
This allows it to be used with get_bits without the thread of overreads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-02 15:44:42 -08:00
Alex Converse
4df369692e mpegts: Do not call read_sl_header() when no bytes remain in the buffer. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-02 15:44:42 -08:00
Anton Khirnov
6e9651d106 lavf: remove AVFormatParameters from AVFormatContext.read_header signature 2012-01-27 10:51:57 +01:00
Alex Converse
41bdd4adc4 mpegts: Suppress invalid timebase warnings on DMB streams. 
timestamp_len and timestamp_res intialize to zero.
 2011-12-20 09:52:05 -08:00
Alex Converse
d9b89b23df mpegts: Fix typo in handling sections in the PMT. 
This was an error rebasing 4682a1dc3a for
commit. The "pes" variable guaranteed to be NULL in that block.
 2011-12-20 09:52:04 -08:00
Vladimir Pantelic
65a25adc97 mpegts: replace some magic numbers with the existing define 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2011-12-16 11:45:36 +02:00
Anton Khirnov
cd3716b9aa Replace all uses of av_close_input_file() with avformat_close_input(). 2011-12-12 20:34:38 +01:00
Anton Khirnov
3a7f7678eb lavf: deprecate av_close_input_stream(). 
And remove all its uses.
 2011-12-12 20:21:47 +01:00
Diego Biurrun
da9cea77e3 Fix a bunch of common typos. 2011-12-11 00:32:25 +01:00
Anton Khirnov
c3f9ebf743 lavf: make av_set_pts_info private. 
It's supposed to be called only from (de)muxers.
 2011-11-30 20:34:45 +01:00
Anton Khirnov
3110ad8329 mpegts: set stream id on just created stream, not an unrelated variable 
Bug introduced in 84ad31ff18.
Thanks to Uoti Urpala for finding it.
 2011-11-08 18:56:39 +01:00
Diego Biurrun
124e28847b Remove some stray unnecessary ffmpeg references. 2011-11-02 10:42:54 +01:00
Alex Converse
ca65932bbf mpegts: MP4 SL support 2011-10-28 14:54:14 -07:00
Alex Converse
c530267024 mpegts: MP4 OD support 2011-10-28 14:54:14 -07:00
Alex Converse
4682a1dc3a mpegts: Add support for Sections in PMT 2011-10-28 14:54:14 -07:00
Alex Converse
fec2836483 mpegts: Replace the MP4 descriptor parser with a recursive parser. 2011-10-28 14:54:14 -07:00
Alex Converse
c3bc6096f2 mpegts: Add support for multiple mp4 descriptors 2011-10-28 14:54:13 -07:00
Alex Converse
476d04a56a mpegts: Parse mpeg2 SL descriptors. 2011-10-28 14:54:13 -07:00
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.
 2011-10-28 09:23:24 +02:00
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.
 2011-10-19 17:02:11 +02:00
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)/'
 2011-10-19 17:02:11 +02:00
Anton Khirnov
145f741e11 AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* 2011-10-12 16:51:16 +02:00
Diego Biurrun
35a6855868 Fix av_dlog invocations with wrong or missing logging context. 
This fixes build failures with -DDEBUG in CPPFLAGS.
 2011-09-21 09:57:32 +02:00
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>
 2011-09-11 09:27:13 -04:00
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>
 2011-09-11 09:26:21 -04:00
Alex Converse
ad6c7c1b52 mp4: Handle non-trivial ES Descriptors. 2011-08-25 11:53:21 -07:00
Alex Converse
d8b999e2d0 mpegts: log into an AVFormatContext rather than MpegTSContext. 
MpegTSContext's AVClass member can be NULL.
 2011-08-16 11:09:39 -07:00
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.
 2011-08-15 19:59:48 +02:00
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>
 2011-08-02 02:52:41 +02:00
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>
 2011-08-02 02:52:27 +02:00
Zohar Kelrich
ce9e31655e mpegts: Mark corrupted packets 
Signed-off-by: Zohar Kelrich <lumimies@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2011-08-02 02:43:22 +02:00
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>
 2011-08-02 02:43:22 +02:00
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>
 2011-08-02 02:43:22 +02:00
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>
 2011-08-02 02:43:21 +02:00
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>
 2011-07-29 08:48:33 +02:00