summaryrefslogtreecommitdiff
path: root/libavformat/mpegts.c
Commit message (Collapse)AuthorAge
* Replace av_dlog with ff_dlog.Ronald S. Bultje2015-08-18
| | | | | 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-14
| | | | Use impersonal form, drop capitalization and ending dot.
* Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <michael@niedermayer.cc>
| * lavc: Consistently prefix input buffer definesVittorio Giovara2015-07-27
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avformat/mpegts: Replace silent cliping of language_count by assertsMichael Niedermayer2015-07-27
| | | | | | | | | | | | | | 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 <michael@niedermayer.cc>
* | avformat/mpegts: Use DVB_TELETEXT timestamp heuristic also for DVB subtitlesMichael Niedermayer2015-07-27
| | | | | | | | | | | | Fixes Ticket4200 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit '42bc768e5240ec01237ad2eb7c69b917158de258'Michael Niedermayer2015-06-30
|\| | | | | | | | | | | | | | | | | | | * commit '42bc768e5240ec01237ad2eb7c69b917158de258': mpegts: Add jpeg2000 stream type Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Add jpeg2000 stream typeJohn Högberg2015-06-30
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | lavf/mpegts: Return 0 if the probe function does not detect mpegts.Carl Eugen Hoyos2015-06-29
| | | | | | | | Reduces console spamming on debug level.
* | avformat/mpegts: Use STREAM_TYPE_PRIVATE_DATA instead of 6Michael Niedermayer2015-06-23
| | | | | | | | | | Suggested-by: Wolfgang Lorenz <wl-chmw@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: recognizes and export private streamsMichael Niedermayer2015-06-12
| | | | | | | | | | Based on patch by Wolfgang Lorenz <wl-chmw@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Do not ignore registration descriptors when probing is enabledMichael Niedermayer2015-06-10
| | | | | | | | | | | | | | This is required for the (not yet in git) private stream detection/export, no other testcase known Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Avoid float in bitrate calculationMichael Niedermayer2015-05-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Detect changes in packet through CRC instead of just the ↵Michael Niedermayer2015-05-01
| | | | | | | | | | | | 5bit version Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: reset last_ver on corrupted packetsMichael Niedermayer2015-05-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Factorize version checking code outMichael Niedermayer2015-05-01
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Also parse the FMC descriptor if the codec has not been ↵Michael Niedermayer2015-04-29
| | | | | | | | | | | | | | | | | | identified yet Fixes Detecting AAC with such descriptor if the parts needed for detection are later in the stream Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: reset last_version on seekingMichael Niedermayer2015-04-29
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '82de8d71118f4eafd6a43e9ea9169bd411793798'Michael Niedermayer2015-04-29
|\| | | | | | | | | | | | | | | | | | | * commit '82de8d71118f4eafd6a43e9ea9169bd411793798': mpegts: Update the PSI/SI table only if the version change Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Update the PSI/SI table only if the version changeJohn Högberg2015-04-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: libav-stable@libav.org Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <michaelni@gmx.at>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-19
| | | | | | | | This applies to every library where performance is not critical.
* | avformat/mpegts: Fix potential pointer overflowsMichael Niedermayer2015-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer2015-02-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 <michaelni@gmx.at>
| * avformat: Don't anonymously typedef structsDiego Biurrun2015-02-14
| |
* | Merge commit '1509c018bd5b054a2354e20021ccbac9c934d213'Michael Niedermayer2015-02-11
|\| | | | | | | | | | | | | | | | | | | * commit '1509c018bd5b054a2354e20021ccbac9c934d213': mpegts: relax restrictions on matching the packet start in read_header Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: relax restrictions on matching the packet start in read_headerAnton Khirnov2015-02-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-11
|\| | | | | | | | | | | | | | | | | | | | | * commit '6a5b8ca4329039fad44ad50b6496948f4bfacb4c': lavf: remove unused code Conflicts: libavformat/seek.c libavformat/seek.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: remove unused codewm42015-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | 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 <anton@khirnov.net>
* | mpegts: identify h264 mvc streamsHendrik Leppkes2015-01-14
| | | | | | | | | | | | This fixes missdetecting such streams as something else like AAC Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0'Michael Niedermayer2014-12-20
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '9cfa68c560bdec82d2d5ec079f9c5b0f9ca37af0': mpegts: add support for Opus Conflicts: libavcodec/opus_parser.c libavformat/mpegts.c See: 74141f693ded2fbf75af56fff309d2db35183635 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: add support for OpusKieran Kunhya2014-12-20
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b'Michael Niedermayer2014-12-19
|\| | | | | | | | | | | | | * commit '8b263331c5ebbb10b6ea521e9fd56751ba94254b': mpegts: check get16() return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: check get16() return valueVittorio Giovara2014-12-18
| | | | | | | | | | | | | | And break flow of execution rather than exiting the function. CC: libav-stable@libav.org Bug-Id: CID 732186
* | avformat/mpegts: Warn if ffio_ensure_seekback() failedMichael Niedermayer2014-12-06
| | | | | | | | | | | | Should silence CID1257005 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: fix Opus stream countRafaël Carré2014-12-05
| | | | | | | | | | | | That number represents the number of streams, not the number of channels Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: improve first valid PMT heuristicMichael Niedermayer2014-11-08
| | | | | | | | | | | | | | This checks for audio+video instead of streams > 2 Fixes Ticket4090 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: add scan_all_pmts optionMichael Niedermayer2014-11-08
| | | | | | | | | | | | | | | | | | | | This allows selecting if the demuxer should consider all streams to be found after the first PMT and add further streams during decoding or if it rather should scan all that are within the analyze-duration and other limits Fixes Ticket3762 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: fix iteration count in add_pid_to_pmt()Michael Niedermayer2014-11-04
| | | | | | | | | | | | Fixes accessing uninitialized memory Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: also print PMT version in av_dlog()Michael Niedermayer2014-11-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Continue parsing PMTs during duration estimationMichael Niedermayer2014-11-03
| | | | | | | | | | | | | | | | | | | | | | | | | | This way if we by chance run into a valid PMT we have a more complete set of streams, also do not reset streams in case we run into a worse PMT Fixes Ticket4046 alternatively Ticket4046 could be closed as invalid or wontfix as it contains some PMTs which lack the 2 subtitle streams Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Do not add pid if its already there with add_pid_to_pmt()Michael Niedermayer2014-11-03
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Add support for Opus in MPEG-TSKieran Kunhya2014-10-26
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegts: add the judgement if a new program is created successfullyDi Wu2014-10-16
| | | | | | | | | | | | | | | | Add the judement after create a new program to avoid segment fault. Signed-off-by: Di Wu <di1028.wu@samsung.com> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: use a padded buffer in read_sl_header()Michael Niedermayer2014-10-04
| | | | | | | | | | | | | | | | Fixes overread Fixes: asan_heap-oob_84f75d_8_asan_heap-oob_a2a00a_341_mbc.ts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Check desc_len / get8() return codeMichael Niedermayer2014-10-04
| | | | | | | | | | | | | | | | Fixes out of array read Fixes: signal_sigsegv_844d59_10_signal_sigsegv_a17bb7_366_mpegts_mpeg2video_mp2_dvbsub_topfield.rec Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Improve probe heuristic by considering the overall ↵Michael Niedermayer2014-09-13
| | | | | | | | | | | | | | | | frequency of 0x47 headers Fixes Ticket3939 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: fix spelling errorAndreas Cadhalpun2014-09-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegts: Change order of structs to match ↵Michael Niedermayer2014-09-03
| | | | | | | | | | | | 7968059e5c3cd8f91407f379c11bbf71a1b84c74 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74'Michael Niedermayer2014-09-03
|\| | | | | | | | | | | | | | | | | | | * commit '7968059e5c3cd8f91407f379c11bbf71a1b84c74': mpegts: Allow custom max resync size Conflicts: libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 15:35:02 +0000