summaryrefslogtreecommitdiff
path: root/libavformat/mpegts.h
Commit message (Collapse)AuthorAge
* avformat/mpegts: Fix indentation for stream_id constantszheng qian2021-04-28
| | | | | Signed-off-by: zheng qian <xqq@xqq.im> Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mpegts: Add missing constants for MPEG-TS stream_id definitionszheng qian2021-04-28
| | | | | Signed-off-by: zheng qian <xqq@xqq.im> Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mpegts: replace magic descriptor_tag values with definesBrad Hards2020-10-16
| | | | | | | | This takes the used values from ISO/IEC 13818-1 Table 2-45 and adds them to the mpegts.h header. No functional changes. Signed-off-by: Brad Hards <bradh@frogmouth.net> Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mpegtsenc: support DVB 6A descriptor for AC-3Limin Wang2020-08-23
| | | | | Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
* avformat/mpegts: add constants for MPEG-TS transport stream identifiersBrad Hards2020-06-09
| | | | | Signed-off-by: Brad Hards <bradh@frogmouth.net> Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mpegtsenc: use standard pids for m2tsMarton Balint2020-04-21
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mpegtsenc: allow any sensible PID for elementary and PMT PIDsMarton Balint2019-12-03
| | | | | | | | | | | | | This sets the range of the first automatically assigned PMT PID or elementary stream PID parameters to [0x20, 0x1ffa]. You can still assign manually a PID for a stream using AVStream->id in the wider [0x10, 0x1ffe] range as specified by ISO13818-1. But since DVB and ATSC both reserves some PIDs, let's not allow them to be automatically assigned. Also make sure that assigned PID numbers are valid and fix the error message for the previous PID collision checks. Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mpegts: add all well known PIDs and TIDs to mpegts.hAnthony Delannoy2019-09-19
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch2016-06-21
|\ | | | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
| * cosmetics: Fix spelling mistakesVittorio Giovara2016-05-04
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | lavf/mpegtsenc: set metadata stream type and write descriptor for ID3 packetsStefano Sabatini2016-05-19
| | | | | | | | This allow to remux data packets which are then recognized as ID3 packets.
* | avformat/mpegtsenc: add flag to embed an AC-3/E-AC-3 ES the DVB wayStefan Pöschel2015-12-24
| | | | | | | | | | | | | | | | | | | | So far an AC-3 elementary stream is refered to in the PMT according to System A (ATSC). An E-AC-3 ES in contrast is embedded the System B (DVB) way. To fix this inconsistency, this commit changes the default E-AC-3 behaviour to use the ATSC way, too. Furthermore a new flag is added to optionally select the DVB way (regarding both codecs and possible further differences in the future). Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/mpegts: remove obsolete ff_mpegts_parse_* cruftJames Almer2014-08-11
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mpegts: rename ff_mpegts_parse_*() to avpriv_mpegts_parse_*()James Almer2014-08-07
| | | | | | | | | | | | | | The were wrongly being exported and used by libavdevice Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2601a9447efb778930b01ac58d2cc1d02498db4e'Michael Niedermayer2014-08-05
|\| | | | | | | | | | | | | | | | | | | | | * commit '2601a9447efb778930b01ac58d2cc1d02498db4e': mpegts: Add HEVC definitions Conflicts: libavformat/mpegts.h See: b2880a3de9e3e160c47c069abcc8cb60015407b6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Add HEVC definitionsFemi Adeyemi-Ejeye2014-08-05
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | avformat/mpegtsenc: Allow DTS audio copy to TS streamsgoodthanks2014-04-27
| | | | | | | | | | | | | | | | | | This doesn't allow encoding of DTS or TrueHD. It just sets the correct stream ID in the TS output file when a DTS or TrueHD audio stream is copied. Fixes ticket #1398 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: move startcode validity check to ff_check_h264_startcodePeter Ross2014-03-30
| | | | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mpegtsenc: fix HEVC MPEG TS stream typeolugbone2014-03-04
| | | | | | | | | | | | Allowing HEVC video using TS stream type 0x24 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'Michael Niedermayer2013-03-15
|\| | | | | | | | | | | | | | | * commit 'b164d66e35d349de414e2f0d7365a147aba8a620': ape: make version-dependent decoding functions called via pointers mpegts: add support for stream_type 0x42, which is CAVS Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: add support for stream_type 0x42, which is CAVSCan Wu2013-03-15
| | | | | | | | | | | | This allows demuxing and muxing of CAVS TS streams. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: yuv4mpeg: return proper error codes. Give all anonymously typedeffed structs in headers a name fate: Add parseutils test parseutils-test: Drop random colors from parsing test vf_pad/scale: use double precision for aspect ratios. build: error on variable-length arrays ppc: swscale: rework yuv2planeX_altivec() ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec() x86: dsputil: kill VLA in gmc_mmx() libspeexenc: Updated commentary to reflect recent changes libspeexenc: Add an option for enabling DTX doc/APIchanges: fill in missing dates and hashes. lavr: bump major to 1 and declare it stable. lavr: change the type of the data buffers to uint8_t**. lavc: deprecate the audio resampling API. Conflicts: cmdutils.h configure doc/APIchanges ffplay.c libavcodec/dwt.h libavcodec/libspeexenc.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavformat/asf.h tests/fate/libavutil.mak tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Give all anonymously typedeffed structs in headers a nameDiego Biurrun2012-10-06
| | | | | | | | Anonymous structs cannot be forward declared and have no benefit.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: adpcm: Clip step_index values read from the bitstream at the beginning of each frame. oma: don't read beyond end of leaf_table. doxygen: Remove documentation for non-existing parameters; misc small fixes. Indeo3: fix crashes on corrupt bitstreams. msmpeg4: Replace forward declaration by proper #include. segment: implement wrap around avf: reorder AVStream and AVFormatContext aacdec: Remove erroneous reference to global gain from the out of bounds scalefactor error message. Conflicts: libavcodec/indeo3.c libavformat/avformat.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * doxygen: Remove documentation for non-existing parameters; misc small fixes.Diego Biurrun2012-02-28
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-29
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (53 commits) probe: Restore identification of files with very large id3 tags and no extension. probe: Remove id3 tag presence as a criteria to do file extension checking. mpegts: MP4 SL support mpegts: MP4 OD support mpegts: Add support for Sections in PMT mpegts: Replace the MP4 descriptor parser with a recursive parser. mpegts: Add support for multiple mp4 descriptors mpegts: Parse mpeg2 SL descriptors. isom: Add MPEG4SYSTEMS dummy object type indication. aacdec: allow output reconfiguration on channel changes nellymoserenc: take float input samples instead of int16 nellymoserdec: use dsp functions for overlap and windowing nellymoserdec: do not fail if there is extra data in the packet nellymoserdec: fail if output buffer is too small nellymoserdec: remove pointless buffer size check. lavf: add init_put_byte() to the list of visible symbols. seek-test: free options dictionary after use snow: do not draw_edge if emu_edge is set tools/pktdumper: update to recent avformat api seek-test: update to recent avformat api ... Conflicts: doc/APIchanges libavcodec/mpegaudiodec.c libavcodec/nellymoserdec.c libavcodec/snow.c libavcodec/version.h libavcodec/wmadec.c libavformat/avformat.h libavformat/mpegts.c libavformat/mxfdec.c libavformat/utils.c libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: MP4 SL supportAlex Converse2011-10-28
| |
| * mpegts: Add support for Sections in PMTAlex Converse2011-10-28
| |
| * mpegts: Add support for multiple mp4 descriptorsAlex Converse2011-10-28
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * mpegtsenc: support CODEC_ID_AAC_LATMPeter Ross2011-01-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $subject. Have used this for loopback testing with mpegts.c. -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B) [2. text/x-diff; 0001-mpegtsenc-support-CODEC_ID_AAC_LATM.patch] From 0f7f9db4b7da1793996af6dda84298507703759a Mon Sep 17 00:00:00 2001 From: Peter Ross <pross@xvid.org> Date: Sun, 9 Jan 2011 09:45:50 +1100 Subject: [PATCH] mpegtsenc: support CODEC_ID_AAC_LATM Signed-off-by: Mans Rullgard <mans@mansr.com>
* | mpegtsenc: support CODEC_ID_AAC_LATMPeter Ross2011-01-30
|/ | | | | | | | | | | | | | | | $subject. Have used this for loopback testing with mpegts.c. -- Peter (A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B) [2. text/x-diff; 0001-mpegtsenc-support-CODEC_ID_AAC_LATM.patch] From 0f7f9db4b7da1793996af6dda84298507703759a Mon Sep 17 00:00:00 2001 From: Peter Ross <pross@xvid.org> Date: Sun, 9 Jan 2011 09:45:50 +1100 Subject: [PATCH] mpegtsenc: support CODEC_ID_AAC_LATM Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 4d54df8e07dca3e30ebcaffd1a0e750a876700a2)
* add ff_parse_mpeg2_descriptor; make MPEG2 descriptor parsing routines ↵Peter Ross2010-12-29
| | | | | | available to other modules. Originally committed as revision 26125 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Fix warnings about implicit function declaration when compiling rtpdec.cAlexis Ballier2010-02-01
| | | | | | Patch by Alexis Ballier, alexis D ballier A gmail Originally committed as revision 21601 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove useless declarations from mpegts.hBaptiste Coudurier2010-01-13
| | | | Originally committed as revision 21205 to svn://svn.ffmpeg.org/ffmpeg/trunk
* mpegts: change variable-length array to fixed lengthMåns Rullgård2009-08-24
| | | | | | The difference between 188 and 204 is not worth worrying about. Originally committed as revision 19697 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove definesBaptiste Coudurier2009-05-31
| | | | Originally committed as revision 19004 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-19
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Globally rename the header inclusion guard names.Stefano Sabatini2008-08-31
| | | | | | | | | Consistently apply this rule: the guard name is obtained from the filename by stripping the leading "lib", converting '/' and '.' to '_' and uppercasing the resulting name. Guard names in the root directory have to be prefixed by "FFMPEG_". Originally committed as revision 15120 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Dirac encapsulation in MPEG-TSAnuradha Suraparaju2008-08-13
| | | | | | patch by Anuradha Suraparaju, anuradha rd.bbc.co uk Originally committed as revision 14734 to svn://svn.ffmpeg.org/ffmpeg/trunk
* treat stream_type==0x82 as AUDIO_DTS when the program has a ↵Nico Sabbi2008-02-23
| | | | | | REGISTRATION_DESCRIPTOR with the value HDMV; approved by Mans Originally committed as revision 12180 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add FFMPEG_ prefix to all multiple inclusion guards.Diego Biurrun2007-10-17
| | | | Originally committed as revision 10765 to svn://svn.ffmpeg.org/ffmpeg/trunk
* remove redundant declaration of mpegts_muxerMåns Rullgård2007-07-08
| | | | Originally committed as revision 9541 to svn://svn.ffmpeg.org/ffmpeg/trunk
* comment endif directive tokenBenoit Fouet2007-06-19
| | | | Originally committed as revision 9369 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add a comment to indicate which #endif belong to which #defineGuillaume Poirier2007-06-17
| | | | Originally committed as revision 9356 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add multiple inclusion guards to headersMåns Rullgård2007-06-17
| | | | Originally committed as revision 9345 to svn://svn.ffmpeg.org/ffmpeg/trunk
* include all prerequisites in header filesMåns Rullgård2007-06-16
| | | | Originally committed as revision 9344 to svn://svn.ffmpeg.org/ffmpeg/trunk
* demux VC1 in mpegtsNico Sabbi2007-02-09
| | | | Originally committed as revision 7902 to svn://svn.ffmpeg.org/ffmpeg/trunk
* "removes definition for old crc func" patch by Daniel Kristjansson / danielk ↵Daniel Kristjansson2007-01-23
| | | | | | | | mrl.nyu edu patch ~ 1year old, apparently forgotten by our mpeg-ts demuxer maintainer Originally committed as revision 7673 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun2006-10-07
| | | | | | and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk