edfc835a56
avformat/mpegtsenc: Add basic multi program support
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-11 22:27:25 +01:00
43ecec0f03
avformat: use AV_OPT_TYPE_BOOL in a bunch of places
2015-12-04 15:43:33 +01:00
eb3628d87f
mpegtsenc: Fix off-by-one in indexing into Opus channel mapping arrays
...
Fixes, CID1338323, CID1338324
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-04 02:35:20 +01:00
64f7db554e
mpegencts: Fix overflow in cbr mode period calculations
...
ts->mux_rate is int (signed 32-bit) type. The period calculations
will start to overflow when mux_rate > 5mbps. This fixes overflows
by converting first to 64-bit type.
Fixes #5044 .
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-12-03 17:43:30 +01:00
7bf465abf3
mpegtsenc: add vc-1 support to MPEG-TS muxer (ticket 2141)
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-16 00:34:12 +01:00
7d6a4797f1
mpegtsenc: Implement writing of Opus trim_start/trim_end control values
...
Signed-off-by: Sebastian Dröge <sebastian@centricular.com>
Reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-06 03:33:17 +01:00
01509cdf92
mpegtsenc: Add support for muxing Opus in MPEG-TS
...
Signed-off-by: Sebastian Dröge <sebastian@centricular.com>
Previous version reviewed-by: Kieran Kunhya <kierank@obe.tv>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-11-06 03:32:40 +01:00
4ffdba2418
mpegts: Make the sdt_period a double
...
Having it as a float didn't even allow enough precision to check
for INT_MAX/2.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-10-17 15:02:40 -04:00
516d34de42
mpegts: Make the pat_period a double
...
Having it as a float didn't even allow enough precision to check
for INT_MAX/2.
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2015-10-17 15:02:06 -04:00
b5e716ae13
avformat/mpegtsenc: Add sdt_period, similar to pat_period
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 23:26:05 +02:00
34da54fd1a
avformat/mpegtsenc: Support a user specified PAT/PMT period
...
Can be used to fix Ticket3714
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 22:24:25 +02:00
a9c1545a33
avformat/mpegtsenc: support storing PAT/PMT per frame
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-18 22:19:19 +02:00
1680f9c588
Merge commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e'
...
* commit '4512ee78e19fdb011bdec1b3a8dc0b315c82a81e':
mpegts: Mark the muxer as supporting variable fps
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-15 21:29:12 +02:00
4512ee78e1
mpegts: Mark the muxer as supporting variable fps
...
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2015-07-15 19:43:48 +02:00
1d5edad8cc
lavf/mpegtsenc: Only fail aac muxing if the first frame is invalid.
...
Fixes ticket #3957 .
2015-07-07 10:44:46 +02:00
40d552dae6
Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
...
* 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>
2015-04-20 03:19:47 +02:00
1a3eb042c7
Replace av_dlog with normal av_log at trace level
...
This applies to every library where performance is not critical.
2015-04-19 12:41:59 +01:00
d0c895d3c5
lavf/mpegtsenc: Accept 0x000001 as startcode for hevc.
...
Fixes ticket #4194 .
2015-04-14 01:57:38 +02:00
5b97681eaa
Merge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0'
...
* commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0':
mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-03 21:01:40 +02:00
7d097a0fc5
mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet
...
Make sure we don't buffer up more than max_delay worth of data
before writing a PES packet, even if pes_payload_size is set to
a larger value.
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-04-03 14:06:15 +03:00
56ffde3f61
Allow muxing h264 into ts with startcode "001" instead of "0001".
...
Fixes ticket #2220 .
Fixes ticket #4324 .
2015-02-25 15:08:33 +01:00
7f03f75ce7
Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a'
...
* commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a':
libavformat: Use ffio_free_dyn_buf where applicable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-25 00:48:50 +01:00
8e32b1f096
libavformat: Use ffio_free_dyn_buf where applicable
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-24 23:07:47 +02:00
33650e0e42
avformat/mpegtsenc: Do not create invalid files from annex b streams without SPS/PPS
...
use global headers to create SPS/PPS when they are available
Fixes Ticket4248
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-12 23:13:15 +01:00
22504396fe
avformat/mpegtsenc: Fix build with msvc
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-03 15:15:50 +01:00
c348a42dcc
Revert "avformat/mpegtsenc: Change the service_type field to enum"
...
This isnt safe due to AVOption accessing this field as int
i just realized a moment after pushing
This reverts commit 0935453e84
2015-02-02 22:30:56 +01:00
0935453e84
avformat/mpegtsenc: Change the service_type field to enum
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 22:15:39 +01:00
48e36f8a12
libavformat/mpegtsenc: allow to set service_type in sdt
...
This adds an option to set the service type in mpegts as defined in ETSI 300 468.
I added what I believe are the most useful service types as pre defined values,
the others can be sent by using their hexdecimal form directly (e.g. -mpegts_service_type digital_radio, -mpegts_service_type 0x07).
I've been using this patch in order to pipe internet radio stream (originally as HLS/m3u8) from ffmpeg to tvheadend,
when the service type set right tvheadend recognize the mpegts stream as a radio channel.
The patch in its original form was written by linuxstb from freenode's hts channel which allowed me pushing it upstream.
This close issue 4118.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-02 22:02:26 +01:00
f7a4589b36
avformat/mpegtsenc: Use av_freep() to avoid leaving stale pointers in memory
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-21 19:25:17 +01:00
6b0f54ddc7
Merge commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa'
...
* commit 'e2ce16392205d8efe9143329ed3fb5fcb15498fa':
mpegts: Support running the write_trailer function without an AVIOContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-20 00:33:40 +01:00
e2ce163922
mpegts: Support running the write_trailer function without an AVIOContext
...
If opening and closing dynamic buffers as AVIOContext, we may
not have any AVIOContext available when wanting to close and
deallocate the muxer. Allow calling write_trailer despite this.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-12-19 23:13:04 +02:00
d76adfae9c
Merge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550'
...
* commit '8f8caca2242e1fe05f37493cfabcd3f4de198550':
Add support for BDAV/m2ts-mode muxing
Conflicts:
libavformat/mpegtsenc.c
See: 09a858da7d
2014-12-02 22:42:35 +01:00
2e0935965b
Drop the unofficial extension prefix for MPEG and MPEG-TS formats
...
As per the RFCs:
http://tools.ietf.org/html/rfc3555#page-38
http://tools.ietf.org/html/rfc3003
CC: libav-stable@libav.org
2014-12-02 15:28:22 +00:00
8f8caca224
Add support for BDAV/m2ts-mode muxing
...
Signed-off-by: Fredrik Axelsson <fraxbe@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-02 15:28:22 +00:00
7319a47c7e
mpegtsenc: recognize .mts as MPEG Transport Stream
2014-12-02 15:28:22 +00:00
873dac50f5
avformat/mpegtsenc: change the min value for mpegts_start_pid to allow ATSC PIDs
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-19 00:49:18 +01:00
3726d07a2a
Merge commit '28816050e47b6dba430a52e429d21a864cffda8e'
...
* commit '28816050e47b6dba430a52e429d21a864cffda8e':
lavf: Set the stream time base hint properly for chained muxers
Conflicts:
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-07 02:51:08 +02:00
28816050e4
lavf: Set the stream time base hint properly for chained muxers
...
This avoids warnings about using the codec time base as time
base hint.
Signed-off-by: Martin Storsjö <martin@martin.st>
2014-10-06 23:30:52 +03:00
aaeae281a8
avformat/mpegtsenc: More verbose warning messages in case of missing video ES startcodes
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-16 03:56:37 +02:00
66d02d3ca6
align and correct messages regarding bitstream filters
...
The messages regarding the recommended use of bitstream filters are somewhat different.
This also adds the ":v" stream specifier to "-bsf h264_mp4toannexb".
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-19 20:18:01 +02:00
fb33bff990
Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'
...
* commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39':
cosmetics: Write NULL pointer equality checks more compactly
Conflicts:
cmdutils.c
ffmpeg_opt.c
ffplay.c
libavcodec/dvbsub.c
libavcodec/dvdsubdec.c
libavcodec/dvdsubenc.c
libavcodec/dxa.c
libavcodec/libxvid_rc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/rv10.c
libavcodec/tiffenc.c
libavcodec/utils.c
libavcodec/vc1dec.c
libavcodec/zmbv.c
libavdevice/v4l2.c
libavformat/matroskadec.c
libavformat/movenc.c
libavformat/sdp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-15 21:00:50 +02:00
1d7544b752
Merge commit 'e8049af1325dd59a51546c15b2e71a0f578e9d27'
...
* commit 'e8049af1325dd59a51546c15b2e71a0f578e9d27':
mpegts: Do not try to write a PMT larger than SECTION_SIZE
Conflicts:
libavformat/mpegtsenc.c
See: 842b6c14bc
2014-08-14 02:13:46 +02:00
e8049af132
mpegts: Do not try to write a PMT larger than SECTION_SIZE
...
Prevent out of array writes.
Similar to what Michael Niedermayer did to address the same issue.
Bug-Id: CVE-2014-2263
CC: libav-stable@libav.org
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-13 12:43:26 -07:00
fddea3f074
Check for hevc startcode when muxing into mpeg-ts.
2014-08-12 08:48:20 +02:00
d123d9abef
Merge commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c'
...
* commit '8dca0877e3e1457e9ec79ffa1ead1135aabb791c':
mpegts: Return proper error code on invalid input data
Conflicts:
libavformat/mpegtsenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-10 20:34:28 +02:00
8dca0877e3
mpegts: Return proper error code on invalid input data
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2014-08-10 07:24:30 -07:00
454697603e
mpegts: Use av_free() to free memory allocated by av_strdup()
2014-08-08 03:12:57 -07:00
92a28e9f56
avformat/mpegtsenc: Use av_freep() for pids
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:04:32 +02:00
31eaecfee9
avformat/mpegtsenc: Free services array completely on failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:04:23 +02:00
12b59e57f3
avformat/mpegtsenc: Use correct deallocation code on failure of pids array allocation
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-07 23:02:10 +02:00
Michael Niedermayer
Clément Bœsch
Sebastian Dröge
Timo Teräs
Hagen Schmidt
Derek Buitenhuis
Luca Barbato
Carl Eugen Hoyos
Michael Niedermayer
Vittorio Giovara
Martin Storsjö
Matt Oliver
dhead666
Florent Le Coz
Fredrik Axelsson
Jean-Baptiste Mardelle
dedicatedbroadcastsolutions
Moritz Barsnick
Nidhi Makhijani
Diego Biurrun