summaryrefslogtreecommitdiffstats
path: root/libavformat/mpegts.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | avformat: Add av_program_add_stream_index()Michael Niedermayer2015-12-111-2/+2
| | | | | | | | | | | | This will be used by the subsequent commit(s) Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat: use AV_OPT_TYPE_BOOL in a bunch of placesClément Bœsch2015-12-041-5/+5
| |
* | lavf/mpegts: use AVERROR_INVALIDDATA instead of AVERROR(EINTR).Nicolas George2015-12-031-1/+1
| |
* | avformat/mpegts: Only start probing data streams within probe_packetsMichael Niedermayer2015-11-051-0/+1
| | | | | | | | | | | | | | | | Fixes assertion failure Fixes: 4321db8ac331f5967ebfbfe80ce5eb78/signal_sigabrt_7ffff6ae7cc9_7213_0d6457b9d6897fa7c78507fa5de53510.ts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <[email protected]>
* | mpegts: Fix FATE seek testHendrik Leppkes2015-10-271-2/+4
| |
* | Replace remaining occurances of av_free_packet with av_packet_unrefHendrik Leppkes2015-10-271-2/+2
| |
* | Merge commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457'Hendrik Leppkes2015-10-271-1/+1
|\| | | | | | | | | | | | | * commit 'ce70f28a1732c74a9cd7fec2d56178750bd6e457': avpacket: Replace av_free_packet with av_packet_unref Merged-by: Hendrik Leppkes <[email protected]>
| * avpacket: Replace av_free_packet with av_packet_unrefLuca Barbato2015-10-261-1/+1
| | | | | | | | | | | | | | `av_packet_unref` matches the AVFrame ref-counted API and can be used as a drop in replacement. Deprecate `av_free_packet`.
* | Merge commit 'cc8db760616a7ec3bd39b22ca45888c01326db13'Hendrik Leppkes2015-09-291-8/+1
|\| | | | | | | | | | | | | * commit 'cc8db760616a7ec3bd39b22ca45888c01326db13': mpegts: use avcodec_get_type() to set codec_type Merged-by: Hendrik Leppkes <[email protected]>
| * mpegts: use avcodec_get_type() to set codec_typewm42015-09-281-8/+1
| | | | | | | | | | | | | | Note that this slightly changes behavior: it sets AVMEDIA_TYPE_UNKNOWN if the codec type is unknown. This should be ok. Signed-off-by: Anton Khirnov <[email protected]>
* | lavc/lavf: remove incompatible abi checks for the new 64bit fieldsJames Almer2015-09-171-6/+1
| | | | | | | | | | Reviewed-by: Michael Niedermayer <[email protected]> Signed-off-by: James Almer <[email protected]>
* | lavf: Switch probesize and max_analyze_duration to 64bit.Carl Eugen Hoyos2015-09-151-1/+1
| | | | | | | | Both are only accessible through AVOptions.
* | mpegts: demux BluRay text subtitlesPetri Hintukainen2015-09-011-0/+1
| | | | | | | | | | Reviewed-by: Paul B Mahol <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | mpegts: fix demuxing PES private stream 2Petri Hintukainen2015-09-011-0/+1
| | | | | | | | | | | | | | PES header size is 6 bytes (00 00 01 bf XX XX), not 0. BluRay text subtitles use private stream 2. Signed-off-by: Michael Niedermayer <[email protected]>
* | lavf: Remove probesize32 and max_analyze_duration32 on version bump.Carl Eugen Hoyos2015-09-011-1/+6
| | | | | | | | | | Add FF_API_PROBESIZE_32 to allow removing 32bit probesize and 32bit max_analyze_duration after the next libavformat version bump.
* | Replace av_dlog with ff_dlog.Ronald S. Bultje2015-08-181-1/+2
| | | | | | | | | | ff_dlog checks compilability, and is non-public. av_dlog is deprecated and no longer exists if FF_API_DLOG=0.
* | lavf/mpegts: apply misc option description fixesStefano Sabatini2015-08-141-8/+8
| | | | | | | | Use impersonal form, drop capitalization and ending dot.
* | Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-271-8/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <[email protected]>
| * lavc: Consistently prefix input buffer definesVittorio Giovara2015-07-271-7/+7
| | | | | | | | Signed-off-by: Vittorio Giovara <[email protected]>
* | avformat/mpegts: Replace silent cliping of language_count by assertsMichael Niedermayer2015-07-271-6/+2
| | | | | | | | | | | | | | Failure should not be possible, if it does occur then the code is buggy and should be fixed not silently clip Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mpegts: Use DVB_TELETEXT timestamp heuristic also for DVB subtitlesMichael Niedermayer2015-07-271-2/+9
| | | | | | | | | | | | Fixes Ticket4200 Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258'Michael Niedermayer2015-06-301-0/+1
|\| | | | | | | | | | | | | | | | | | | * commit '42bc768e5240ec01237ad2eb7c69b917158de258': mpegts: Add jpeg2000 stream type Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <[email protected]>
| * mpegts: Add jpeg2000 stream typeJohn Högberg2015-06-301-0/+1
| | | | | | | | Signed-off-by: Luca Barbato <[email protected]>
* | lavf/mpegts: Return 0 if the probe function does not detect mpegts.Carl Eugen Hoyos2015-06-291-2/+2
| | | | | | | | Reduces console spamming on debug level.
* | avformat/mpegts: Use STREAM_TYPE_PRIVATE_DATA instead of 6Michael Niedermayer2015-06-231-1/+1
| | | | | | | | | | Suggested-by: Wolfgang Lorenz <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mpegts: recognizes and export private streamsMichael Niedermayer2015-06-121-0/+8
| | | | | | | | | | Based on patch by Wolfgang Lorenz <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mpegts: Do not ignore registration descriptors when probing is enabledMichael Niedermayer2015-06-101-1/+1
| | | | | | | | | | | | | | This is required for the (not yet in git) private stream detection/export, no other testcase known Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mpegts: Avoid float in bitrate calculationMichael Niedermayer2015-05-261-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mpegts: Detect changes in packet through CRC instead of just the ↵Michael Niedermayer2015-05-011-1/+7
| | | | | | | | | | | | 5bit version Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mpegts: reset last_ver on corrupted packetsMichael Niedermayer2015-05-011-1/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mpegts: Factorize version checking code outMichael Niedermayer2015-05-011-8/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mpegts: Also parse the FMC descriptor if the codec has not been ↵Michael Niedermayer2015-04-291-1/+3
| | | | | | | | | | | | | | | | | | identified yet Fixes Detecting AAC with such descriptor if the parts needed for detection are later in the stream Signed-off-by: Michael Niedermayer <[email protected]>
* | avformat/mpegts: reset last_version on seekingMichael Niedermayer2015-04-291-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '82de8d71118f4eafd6a43e9ea9169bd411793798'Michael Niedermayer2015-04-291-0/+20
|\| | | | | | | | | | | | | | | | | | | * commit '82de8d71118f4eafd6a43e9ea9169bd411793798': mpegts: Update the PSI/SI table only if the version change Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <[email protected]>
| * mpegts: Update the PSI/SI table only if the version changeJohn Högberg2015-04-281-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a PAT is finished while a PMT section filter is opened but not yet finished, the PMT section filter is closed and all the received data is discarded. This is usually not an issue but some multiplexers (With very quick PAT/PMT repetition settings) consistently emit a PMT section start, then a PAT, and then the rest of the PMT, causing the aforementioned behavior to result in no PMT being finished. In the most pathologic situation the stream information are lost and the probe fallback miscategorizes subtitles as mp3 audio. Avoid the issue through eliminating redundant PSI/SI table updates by checking their version field, which is required by the standard to be incremented on every change no matter how minor. CC: [email protected] Signed-off-by: Luca Barbato <[email protected]>
* | Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-201-17/+17
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <[email protected]>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-191-18/+18
| | | | | | | | This applies to every library where performance is not critical.
* | avformat/mpegts: Fix potential pointer overflowsMichael Niedermayer2015-03-161-3/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer2015-02-141-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e': avformat: Don't anonymously typedef structs Conflicts: libavformat/adtsenc.c libavformat/aiffenc.c libavformat/avidec.c libavformat/gif.c libavformat/iff.c libavformat/img2dec.c libavformat/jvdec.c libavformat/matroskadec.c libavformat/udp.c libavformat/wtvdec.c Merged-by: Michael Niedermayer <[email protected]>
| * avformat: Don't anonymously typedef structsDiego Biurrun2015-02-141-2/+2
| |
* | Merge commit '1509c018bd5b054a2354e20021ccbac9c934d213'Michael Niedermayer2015-02-111-8/+10
|\| | | | | | | | | | | | | | | | | | | * commit '1509c018bd5b054a2354e20021ccbac9c934d213': mpegts: relax restrictions on matching the packet start in read_header Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <[email protected]>
| * mpegts: relax restrictions on matching the packet start in read_headerAnton Khirnov2015-02-101-8/+10
| | | | | | | | | | | | | | | | | | | | | | analyze() is currently called both when probing and from read_header(). It determines the packet start by looking for the sync byte, followed by unset Transport Error Indicator and valid adaptation_field_control. This makes sense to do when probing, but once we already know the format is MPEG-TS, it is counterproductive to be so strict -- e.g. in some files the TEI might be set and analyze() might get called with a smaller buffer than the one used for probing, resulting in a failure.
* | Merge commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c'Michael Niedermayer2015-02-111-1/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c': lavf: remove unused code Conflicts: libavformat/seek.c libavformat/seek.h Merged-by: Michael Niedermayer <[email protected]>
| * lavf: remove unused codewm42015-02-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | Nothing uses it, and it provides no public API. Archeological finds: Commit 101036adb9 added the API. Commit a8dd8dc6e9 made mpegts.c use it. Commit af8aae3fa3 disabled it by default in mpegts.c. Commit ae2bb52cd2 removed all uses of this from mpegts.c. Signed-off-by: Anton Khirnov <[email protected]>
* | mpegts: identify h264 mvc streamsHendrik Leppkes2015-01-141-0/+1
| | | | | | | | | | | | This fixes missdetecting such streams as something else like AAC Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0'Michael Niedermayer2014-12-201-5/+6
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0': mpegts: add support for Opus Conflicts: libavcodec/opus_parser.c libavformat/mpegts.c See: 74141f693ded2fbf75af56fff309d2db35183635 Merged-by: Michael Niedermayer <[email protected]>
| * mpegts: add support for OpusKieran Kunhya2014-12-201-1/+53
| | | | | | | | Signed-off-by: Anton Khirnov <[email protected]>
* | Merge commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b'Michael Niedermayer2014-12-191-1/+4
|\| | | | | | | | | | | | | * commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b': mpegts: check get16() return value Merged-by: Michael Niedermayer <[email protected]>
| * mpegts: check get16() return valueVittorio Giovara2014-12-181-1/+4
| | | | | | | | | | | | | | And break flow of execution rather than exiting the function. CC: [email protected] Bug-Id: CID 732186
* | avformat/mpegts: Warn if ffio_ensure_seekback() failedMichael Niedermayer2014-12-061-1/+2
| | | | | | | | | | | | Should silence CID1257005 Signed-off-by: Michael Niedermayer <[email protected]>