-diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
-@@ -56,7 +56,8 @@ typedef struct MpegTSService {
- int sid; /* service ID */
- uint8_t name[256];
- uint8_t provider_name[256];
-- int pcr_pid;
-+ int pcr_sid; /* stream triggering pcr writes */
-+ int pcr_pid; /* pid of pcr stream */
- AVProgram *program;
- } MpegTSService;
-
-@@ -79,10 +80,8 @@ typedef struct MpegTSWrite {
- int64_t sdt_period; /* SDT period in PCR time base */
+@@ -89,9 +89,11 @@
int64_t pat_period; /* PAT/PMT period in PCR time base */
+ int64_t nit_period; /* NIT period in PCR time base */
int nb_services;
-- int onid;
-- int tsid;
- int64_t first_pcr;
+ int first_dts_checked;
- int64_t next_pcr;
-+ int onid, tsid;
-+ int64_t pcr, first_pcr, next_pcr, delay;
++ int64_t pcr_pos, pcr;
++ int64_t first_pcr, next_pcr;
++ int64_t delay;
++ int pcr_stream_pid;
int mux_rate; ///< set to 1 when VBR
int pes_payload_size;
+ int64_t total_size;
+@@ -258,7 +260,7 @@
+ int data_st_warning;
-@@ -94,8 +93,8 @@ typedef struct MpegTSWrite {
- int pmt_start_pid;
- int start_pid;
- int m2ts_mode;
-+ int64_t ts_offset;
-
-- int pcr_period_ms;
- #define MPEGTS_FLAG_REEMIT_PAT_PMT 0x01
- #define MPEGTS_FLAG_AAC_LATM 0x02
- #define MPEGTS_FLAG_PAT_PMT_AT_FRAMES 0x04
-@@ -104,11 +103,11 @@ typedef struct MpegTSWrite {
- int flags;
- int copyts;
- int tables_version;
-- int64_t pat_period_us;
-- int64_t sdt_period_us;
-- int64_t last_pat_ts;
-+ double pcr_period_ms;
-+ double sdt_period_ms;
-+ double pat_period_ms;
- int64_t last_sdt_ts;
--
-+ int64_t last_pat_ts;
- int omit_video_pes_length;
- } MpegTSWrite;
-
-@@ -217,10 +216,10 @@ static int mpegts_write_section1(MpegTSSection *s, int tid, int id,
- #define DEFAULT_PROVIDER_NAME "FFmpeg"
- #define DEFAULT_SERVICE_NAME "Service"
-
--/* we retransmit the SI info at this rate */
-+/* we retransmit the SI info at this rate (ms) */
- #define SDT_RETRANS_TIME 500
- #define PAT_RETRANS_TIME 100
--#define PCR_RETRANS_TIME 20
-+#define PCR_RETRANS_TIME 50
-
- typedef struct MpegTSWriteStream {
- int pid; /* stream associated pid */
-@@ -234,7 +233,7 @@ typedef struct MpegTSWriteStream {
- int payload_flags;
- uint8_t *payload;
- AVFormatContext *amux;
--
-+ MpegTSService *service;
int64_t pcr_period; /* PCR period in PCR time base */
- int64_t last_pcr;
+- int64_t last_pcr;
++ int64_t pcr_timer;
-@@ -713,18 +712,11 @@ invalid:
+ /* For Opus */
+ int opus_queued_samples;
+@@ -959,18 +961,18 @@
return 0;
}
--static int64_t get_pcr(const MpegTSWrite *ts, AVIOContext *pb)
--{
-- return av_rescale(avio_tell(pb) + 11, 8 * PCR_TIME_BASE, ts->mux_rate) +
+-static int64_t get_pcr(const MpegTSWrite *ts)
++static int64_t get_pcr(const MpegTSWrite *ts, AVIOContext *pb)
+ {
+- return av_rescale(ts->total_size + 11, 8 * PCR_TIME_BASE, ts->mux_rate) +
- ts->first_pcr;
--}
--
++ int64_t pos = avio_tell(pb) + 11;
++ return ts->pcr + (ts->mux_rate == 1 ? (pos - ts->pcr_pos) * 8 :
++ av_rescale(pos - ts->pcr_pos, 8 * PCR_TIME_BASE, ts->mux_rate));
+ }
+
static void write_packet(AVFormatContext *s, const uint8_t *packet)
{
MpegTSWrite *ts = s->priv_data;
if (ts->m2ts_mode) {
-- int64_t pcr = get_pcr(s->priv_data, s->pb);
+- int64_t pcr = get_pcr(s->priv_data);
- uint32_t tp_extra_header = pcr % 0x3fffffff;
-+ uint32_t tp_extra_header = ts->pcr % 0x3fffffff;
++ uint32_t tp_extra_header = get_pcr(ts, s->pb) % 0x3fffffff;
tp_extra_header = AV_RB32(&tp_extra_header);
avio_write(s->pb, (unsigned char *) &tp_extra_header,
sizeof(tp_extra_header));
-@@ -763,6 +755,7 @@ static MpegTSService *mpegts_add_service(AVFormatContext *s, int sid,
- service->pmt.pid = ts->pmt_start_pid + ts->nb_services;
- service->sid = sid;
- service->pcr_pid = 0x1fff;
-+ service->pcr_sid = 0x1fff;
- if (encode_str8(service->provider_name, provider_name) < 0 ||
- encode_str8(service->name, service_name) < 0) {
- av_log(s, AV_LOG_ERROR, "Too long service or provider name\n");
-@@ -788,30 +781,32 @@ static void enable_pcr_generation_for_stream(AVFormatContext *s, AVStream *pcr_s
- MpegTSWrite *ts = s->priv_data;
- MpegTSWriteStream *ts_st = pcr_st->priv_data;
-
-- if (ts->mux_rate > 1 || ts->pcr_period_ms >= 0) {
-- int pcr_period_ms = ts->pcr_period_ms == -1 ? PCR_RETRANS_TIME : ts->pcr_period_ms;
-- ts_st->pcr_period = av_rescale(pcr_period_ms, PCR_TIME_BASE, 1000);
-- } else {
-+ int64_t pcr_period = -1;
-+ if (ts->pcr_period_ms >= 0)
-+ pcr_period = av_rescale(ts->pcr_period_ms, PCR_TIME_BASE, 1000);
-+ else if (ts->mux_rate == 1) {
- /* By default, for VBR we select the highest multiple of frame duration which is less than 100 ms. */
- int64_t frame_period = 0;
- if (pcr_st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) {
- int frame_size = av_get_audio_frame_duration2(pcr_st->codecpar, 0);
-- if (!frame_size) {
-+ if (frame_size > 0)
-+ frame_period = av_rescale_rnd(frame_size, PCR_TIME_BASE, pcr_st->codecpar->sample_rate, AV_ROUND_UP);
-+ else
- av_log(s, AV_LOG_WARNING, "frame size not set\n");
-- frame_size = 512;
-- }
-- frame_period = av_rescale_rnd(frame_size, PCR_TIME_BASE, pcr_st->codecpar->sample_rate, AV_ROUND_UP);
- } else if (pcr_st->avg_frame_rate.num) {
- frame_period = av_rescale_rnd(pcr_st->avg_frame_rate.den, PCR_TIME_BASE, pcr_st->avg_frame_rate.num, AV_ROUND_UP);
- }
-- if (frame_period > 0 && frame_period <= PCR_TIME_BASE / 10)
-- ts_st->pcr_period = frame_period * (PCR_TIME_BASE / 10 / frame_period);
-- else
-- ts_st->pcr_period = 1;
-+ if (frame_period > 0 && frame_period <= PCR_TIME_BASE / 10) {
-+ int pcr_frames = (PCR_TIME_BASE / 10) / frame_period;
-+ if( pcr_frames > 0 )
-+ pcr_period = frame_period * pcr_frames;
-+ }
+@@ -1056,9 +1058,6 @@
+ else
+ ts_st->pcr_period = 1;
}
-
-+ if( pcr_period < 0 )
-+ pcr_period = av_rescale(PCR_RETRANS_TIME, PCR_TIME_BASE, 1000);
-+ ts_st->pcr_period = pcr_period;
- // output a PCR as soon as possible
+- // output a PCR as soon as possible
- ts_st->last_pcr = ts->first_pcr - ts_st->pcr_period;
-+ ts_st->last_pcr = ts->first_pcr - pcr_period;
}
static void select_pcr_streams(AVFormatContext *s)
-@@ -823,22 +818,32 @@ static void select_pcr_streams(AVFormatContext *s)
- AVStream *pcr_st = NULL;
- AVProgram *program = service->program;
- int nb_streams = program ? program->nb_stream_indexes : s->nb_streams;
--
-+ /* find first video stream, or just use first stream */
- for (int j = 0; j < nb_streams; j++) {
- AVStream *st = s->streams[program ? program->stream_index[j] : j];
-- if (!pcr_st ||
-- pcr_st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO && st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
-- {
-+ if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
- pcr_st = st;
-+ break;
- }
- }
--
-+ if (!pcr_st && s->nb_streams > 0)
-+ pcr_st = s->streams[0];
- if (pcr_st) {
- MpegTSWriteStream *ts_st = pcr_st->priv_data;
-- service->pcr_pid = ts_st->pid;
-+ service->pcr_sid = ts_st->pid; /* stream id for pcr writes */
-+ service->pcr_pid = ts->m2ts_mode > 1 ? /* pcr pid */
-+ 0x1000 + ts->service_id : ts_st->pid;
- enable_pcr_generation_for_stream(s, pcr_st);
- av_log(s, AV_LOG_VERBOSE, "service %i using PCR in pid=%i, pcr_period=%"PRId64"ms\n",
- service->sid, service->pcr_pid, av_rescale(ts_st->pcr_period, 1000, PCR_TIME_BASE));
-+ for (int j = 0; j < nb_streams; j++) {
-+ AVStream *st = s->streams[program ? program->stream_index[j] : j];
-+ MpegTSWriteStream *ts_st = st->priv_data;
-+ ts_st->service = service;
-+ }
-+ if (service->pmt.pid == service->pcr_pid) {
-+ av_log(s, AV_LOG_ERROR, "Duplicate stream id %d\n", service->pcr_pid);
-+ }
- }
- }
- }
-@@ -860,6 +865,15 @@ static int mpegts_init(AVFormatContext *s)
+@@ -1121,6 +1120,7 @@
if (s->max_delay < 0) /* Not set by the caller */
s->max_delay = 0;
+ ts->delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE);
-+
-+ if (ts->m2ts_mode == -1) {
-+ if (av_match_ext(s->url, "m2ts")) {
-+ ts->m2ts_mode = 1;
-+ } else {
-+ ts->m2ts_mode = 0;
-+ }
-+ }
// round up to a whole number of TS packets
ts->pes_payload_size = (ts->pes_payload_size + 14 + 183) / 184 * 184 - 14;
-@@ -920,14 +934,11 @@ static int mpegts_init(AVFormatContext *s)
-
+@@ -1180,7 +1180,9 @@
/* MPEG pid values < 16 are reserved. Applications which set st->id in
* this range are assigned a calculated pid. */
-- if (st->id < 16) {
-- ts_st->pid = ts->start_pid + i;
-- } else {
-- ts_st->pid = st->id;
-- }
-- if (ts_st->pid >= 0x1FFF) {
-+ ts_st->pid = ts->start_pid >= 0 ? ts->start_pid + i :
-+ st->id >= 16 ? st->id : FIRST_OTHER_PID + i;
-+ if (ts_st->pid < 16 || ts_st->pid >= 0x1FFF) {
- av_log(s, AV_LOG_ERROR,
-- "Invalid stream id %d, must be less than 8191\n", st->id);
-+ "Invalid stream id %d, must be in 16...8191\n", ts_st->pid);
- ret = AVERROR(EINVAL);
- goto fail;
+ if (st->id < 16) {
+- if (ts->m2ts_mode) {
++ if (ts->start_pid >= 0)
++ ts_st->pid = ts->start_pid + i;
++ else if (ts->m2ts_mode) {
+ switch (st->codecpar->codec_type) {
+ case AVMEDIA_TYPE_VIDEO:
+ ts_st->pid = ts->m2ts_video_pid++;
+@@ -1207,9 +1209,9 @@
+ av_log(s, AV_LOG_ERROR, "Cannot automatically assign PID for stream %d\n", st->index);
+ return AVERROR(EINVAL);
+ }
+- } else {
+- ts_st->pid = ts->start_pid + i;
+ }
++ else
++ ts_st->pid = START_PID + i;
+ } else {
+ ts_st->pid = st->id;
}
-@@ -998,8 +1009,8 @@ static int mpegts_init(AVFormatContext *s)
-
+@@ -1277,9 +1279,14 @@
ts->last_pat_ts = AV_NOPTS_VALUE;
ts->last_sdt_ts = AV_NOPTS_VALUE;
+ ts->last_nit_ts = AV_NOPTS_VALUE;
- ts->pat_period = av_rescale(ts->pat_period_us, PCR_TIME_BASE, AV_TIME_BASE);
- ts->sdt_period = av_rescale(ts->sdt_period_us, PCR_TIME_BASE, AV_TIME_BASE);
-+ ts->pat_period = av_rescale(ts->pat_period_ms, PCR_TIME_BASE, 1000);
-+ ts->sdt_period = av_rescale(ts->sdt_period_ms, PCR_TIME_BASE, 1000);
+- ts->nit_period = av_rescale(ts->nit_period_us, PCR_TIME_BASE, AV_TIME_BASE);
++ ts->pat_period = ts->pat_period_us < 0 ? -1 :
++ av_rescale(ts->pat_period_us, PCR_TIME_BASE, AV_TIME_BASE);
++ ts->sdt_period = ts->sdt_period_us < 0 ? -1 :
++ av_rescale(ts->sdt_period_us, PCR_TIME_BASE, AV_TIME_BASE);
++ ts->nit_period = ts->nit_period_us < 0 ? -1 :
++ av_rescale(ts->nit_period_us, PCR_TIME_BASE, AV_TIME_BASE);
++ ts->pcr = 0;
++ ts->pcr_pos = 0;
- if (ts->mux_rate == 1)
- av_log(s, AV_LOG_VERBOSE, "muxrate VBR, ");
-@@ -1022,20 +1033,16 @@ static void retransmit_si_info(AVFormatContext *s, int force_pat, int force_sdt,
+ /* assign provider name */
+ provider = av_dict_get(s->metadata, "service_provider", NULL, 0);
+@@ -1295,8 +1302,8 @@
+ av_log(s, AV_LOG_VERBOSE, "muxrate %d, ", ts->mux_rate);
+ av_log(s, AV_LOG_VERBOSE,
+ "sdt every %"PRId64" ms, pat/pmt every %"PRId64" ms",
+- av_rescale(ts->sdt_period, 1000, PCR_TIME_BASE),
+- av_rescale(ts->pat_period, 1000, PCR_TIME_BASE));
++ ts->sdt_period < 0 ? -1 : av_rescale(ts->sdt_period, 1000, PCR_TIME_BASE),
++ ts->pat_period < 0 ? -1 : av_rescale(ts->pat_period, 1000, PCR_TIME_BASE));
+ if (ts->flags & MPEGTS_FLAG_NIT)
+ av_log(s, AV_LOG_VERBOSE, ", nit every %"PRId64" ms", av_rescale(ts->nit_period, 1000, PCR_TIME_BASE));
+ av_log(s, AV_LOG_VERBOSE, "\n");
+@@ -1305,36 +1312,40 @@
+ }
+
+ /* send SDT, NIT, PAT and PMT tables regularly */
+-static void retransmit_si_info(AVFormatContext *s, int force_pat, int force_sdt, int force_nit, int64_t pcr)
++static void retransmit_si_info(AVFormatContext *s, int force_pat, int force_sdt, int force_nit)
{
MpegTSWrite *ts = s->priv_data;
int i;
--
+
- if ((pcr != AV_NOPTS_VALUE && ts->last_sdt_ts == AV_NOPTS_VALUE) ||
- (pcr != AV_NOPTS_VALUE && pcr - ts->last_sdt_ts >= ts->sdt_period) ||
- force_sdt
- ) {
- if (pcr != AV_NOPTS_VALUE)
- ts->last_sdt_ts = FFMAX(pcr, ts->last_sdt_ts);
-+ if (force_sdt || (ts->sdt_period >= 0 && pcr != AV_NOPTS_VALUE &&
-+ (ts->last_sdt_ts == AV_NOPTS_VALUE || (pcr - ts->last_sdt_ts >= ts->sdt_period)) )) {
-+ if (pcr > ts->last_sdt_ts)
-+ ts->last_sdt_ts = pcr;
- mpegts_write_sdt(s);
- }
+- mpegts_write_sdt(s);
+- }
- if ((pcr != AV_NOPTS_VALUE && ts->last_pat_ts == AV_NOPTS_VALUE) ||
- (pcr != AV_NOPTS_VALUE && pcr - ts->last_pat_ts >= ts->pat_period) ||
- force_pat) {
- if (pcr != AV_NOPTS_VALUE)
- ts->last_pat_ts = FFMAX(pcr, ts->last_pat_ts);
-+ if (force_pat || (ts->pat_period >= 0 && pcr != AV_NOPTS_VALUE &&
-+ (ts->last_pat_ts == AV_NOPTS_VALUE || (pcr - ts->last_pat_ts >= ts->pat_period)) )) {
-+ if (pcr > ts->last_pat_ts)
+- mpegts_write_pat(s);
+- for (i = 0; i < ts->nb_services; i++)
+- mpegts_write_pmt(s, ts->services[i]);
+- }
+- if ((pcr != AV_NOPTS_VALUE && ts->last_nit_ts == AV_NOPTS_VALUE) ||
+- (pcr != AV_NOPTS_VALUE && pcr - ts->last_nit_ts >= ts->nit_period) ||
+- force_nit
+- ) {
+- if (pcr != AV_NOPTS_VALUE)
+- ts->last_nit_ts = FFMAX(pcr, ts->last_nit_ts);
++ if (ts->sdt_period >= 0) {
++ int64_t pcr = get_pcr(ts, s->pb);
++ if (ts->last_sdt_ts == AV_NOPTS_VALUE || pcr >= ts->last_sdt_ts + ts->sdt_period)
++ force_sdt = 1;
++ if (force_sdt) {
++ ts->last_sdt_ts = pcr;
++ mpegts_write_sdt(s);
++ }
++ }
++ if (ts->pat_period >= 0) {
++ int64_t pcr = get_pcr(ts, s->pb);
++ if (ts->last_pat_ts == AV_NOPTS_VALUE || pcr >= ts->last_pat_ts + ts->pat_period)
++ force_pat = 1;
++ if (force_pat) {
+ ts->last_pat_ts = pcr;
- mpegts_write_pat(s);
- for (i = 0; i < ts->nb_services; i++)
- mpegts_write_pmt(s, ts->services[i]);
-@@ -1076,13 +1083,14 @@ static void mpegts_insert_pcr_only(AVFormatContext *s, AVStream *st)
++ mpegts_write_pat(s);
++ for (i = 0; i < ts->nb_services; i++)
++ mpegts_write_pmt(s, ts->services[i]);
++ }
++ }
++ if (ts->nit_period >= 0) {
++ int64_t pcr = get_pcr(ts, s->pb);
++ if (ts->last_nit_ts == AV_NOPTS_VALUE || pcr >= ts->last_nit_ts + ts->nit_period)
++ force_nit = 1;
++ if (force_nit) {
++ ts->last_nit_ts = pcr;
+ if (ts->flags & MPEGTS_FLAG_NIT)
+ mpegts_write_nit(s);
++ }
+ }
+ }
+
+@@ -1371,25 +1382,29 @@
+ static void mpegts_insert_pcr_only(AVFormatContext *s, AVStream *st)
{
MpegTSWrite *ts = s->priv_data;
- MpegTSWriteStream *ts_st = st->priv_data;
-+ uint32_t pcr_pid = ts_st->service->pcr_pid;
+- MpegTSWriteStream *ts_st = st->priv_data;
++ int64_t pcr = get_pcr(ts, s->pb);
++ MpegTSWriteStream *ts_st = st ? st->priv_data : 0;
++ uint32_t pcr_pid = ts_st ? ts_st->pid : ts->pcr_stream_pid;
uint8_t *q;
uint8_t buf[TS_PACKET_SIZE];
*q++ = 0x47;
- *q++ = ts_st->pid >> 8;
- *q++ = ts_st->pid;
+- *q++ = 0x20 | ts_st->cc; /* Adaptation only */
+ *q++ = pcr_pid >> 8;
+ *q++ = pcr_pid;
- *q++ = 0x20 | ts_st->cc; /* Adaptation only */
++ uint32_t flags = 0x20; /* Adaptation only */
/* Continuity Count field does not increment (see 13818-1 section 2.4.3.3) */
++ if(ts_st) flags |= ts_st->cc;
++ *q++ = flags;
*q++ = TS_PACKET_SIZE - 5; /* Adaptation Field Length */
-@@ -1093,7 +1101,7 @@ static void mpegts_insert_pcr_only(AVFormatContext *s, AVStream *st)
+ *q++ = 0x10; /* Adaptation flags: PCR present */
+- if (ts_st->discontinuity) {
++ if (ts_st && ts_st->discontinuity) {
+ q[-1] |= 0x80;
+ ts_st->discontinuity = 0;
}
/* PCR coded into 6 bytes */
-- q += write_pcr_bits(q, get_pcr(ts, s->pb));
-+ q += write_pcr_bits(q, ts->pcr);
+- q += write_pcr_bits(q, get_pcr(ts));
++ q += write_pcr_bits(q, pcr);
/* stuffing bytes */
memset(q, 0xFF, TS_PACKET_SIZE - (q - buf));
-@@ -1161,7 +1169,6 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
- uint8_t *q;
- int val, is_start, len, header_len, write_pcr, is_dvb_subtitle, is_dvb_teletext, flags;
+@@ -1490,9 +1505,9 @@
int afc_len, stuffing_len;
+ int is_dvb_subtitle = (st->codecpar->codec_id == AV_CODEC_ID_DVB_SUBTITLE);
+ int is_dvb_teletext = (st->codecpar->codec_id == AV_CODEC_ID_DVB_TELETEXT);
- int64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE);
int force_pat = st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO && key && !ts_st->prev_payload_key;
int force_sdt = 0;
++ int64_t pcr;
+ int force_nit = 0;
-@@ -1178,67 +1185,46 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
+ av_assert0(ts_st->payload != buf || st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO);
+@@ -1509,21 +1524,19 @@
is_start = 1;
while (payload_size > 0) {
- int64_t pcr = AV_NOPTS_VALUE;
- if (ts->mux_rate > 1)
-- pcr = get_pcr(ts, s->pb);
+- pcr = get_pcr(ts);
- else if (dts != AV_NOPTS_VALUE)
- pcr = (dts - delay) * 300;
-+ ts->pcr = ts->first_pcr + (ts->mux_rate == 1 ?
-+ (dts == AV_NOPTS_VALUE ? 0 : (dts - ts->delay) * 300) :
-+ // add 11, pcr references the last byte of program clock reference base
-+ av_rescale(avio_tell(s->pb) + 11, 8 * PCR_TIME_BASE, ts->mux_rate));
-
-- retransmit_si_info(s, force_pat, force_sdt, pcr);
-+ retransmit_si_info(s, force_pat, force_sdt, ts->pcr);
- force_pat = 0;
- force_sdt = 0;
+-
+- retransmit_si_info(s, force_pat, force_sdt, force_nit, pcr);
+- force_pat = 0;
+- force_sdt = 0;
+- force_nit = 0;
++ // add 11, pcr references the last byte of program clock reference base
++ ts->pcr_pos = avio_tell(s->pb) + 11;
++ pcr = ts->pcr = ts->mux_rate != 1 ?
++ av_rescale(ts->pcr_pos, 8 * PCR_TIME_BASE, ts->mux_rate) :
++ (dts == AV_NOPTS_VALUE ? 0 : (dts - ts->delay) * 300);
++ if (force_pat || force_sdt || force_nit) {
++ retransmit_si_info(s, force_pat, force_sdt, force_nit);
++ force_pat = force_sdt = force_nit = 0;
++ }
write_pcr = 0;
-- if (ts->mux_rate > 1) {
-- /* Send PCR packets for all PCR streams if needed */
-- pcr = get_pcr(ts, s->pb);
-- if (pcr >= ts->next_pcr) {
-- int64_t next_pcr = INT64_MAX;
-- for (int i = 0; i < s->nb_streams; i++) {
-- /* Make the current stream the last, because for that we
-- * can insert the pcr into the payload later */
-- int st2_index = i < st->index ? i : (i + 1 == s->nb_streams ? st->index : i + 1);
-- AVStream *st2 = s->streams[st2_index];
-- MpegTSWriteStream *ts_st2 = st2->priv_data;
-- if (ts_st2->pcr_period) {
+ if (ts->mux_rate > 1) {
+ /* Send PCR packets for all PCR streams if needed */
+- pcr = get_pcr(ts);
+ if (pcr >= ts->next_pcr) {
+ int64_t next_pcr = INT64_MAX;
+ for (int i = 0; i < s->nb_streams; i++) {
+@@ -1533,36 +1546,43 @@
+ AVStream *st2 = s->streams[st2_index];
+ MpegTSWriteStream *ts_st2 = st2->priv_data;
+ if (ts_st2->pcr_period) {
- if (pcr - ts_st2->last_pcr >= ts_st2->pcr_period) {
- ts_st2->last_pcr = FFMAX(pcr - ts_st2->pcr_period, ts_st2->last_pcr + ts_st2->pcr_period);
- if (st2 != st) {
-- mpegts_insert_pcr_only(s, st2);
-- pcr = get_pcr(ts, s->pb);
-- } else {
-- write_pcr = 1;
-- }
-- }
++ if (pcr >= ts_st2->pcr_timer) {
++ ts_st2->pcr_timer = pcr + ts_st2->pcr_period;
++ if (st2 != st) {
+ mpegts_insert_pcr_only(s, st2);
+- pcr = get_pcr(ts);
+ } else {
+ write_pcr = 1;
+ }
+ }
- next_pcr = FFMIN(next_pcr, ts_st2->last_pcr + ts_st2->pcr_period);
-- }
-- }
-- ts->next_pcr = next_pcr;
-- }
++ next_pcr = FFMIN(next_pcr, ts_st2->pcr_timer);
+ }
+ }
+ ts->next_pcr = next_pcr;
+ }
- if (dts != AV_NOPTS_VALUE && (dts - pcr / 300) > delay) {
- /* pcr insert gets priority over null packet insert */
- if (write_pcr)
- } else if (ts_st->pcr_period && pcr != AV_NOPTS_VALUE) {
- if (pcr - ts_st->last_pcr >= ts_st->pcr_period && is_start) {
- ts_st->last_pcr = FFMAX(pcr - ts_st->pcr_period, ts_st->last_pcr + ts_st->pcr_period);
-- write_pcr = 1;
-- }
-+ if (ts_st->pcr_period > 0 && ts_st->pid == ts_st->service->pcr_sid &&
-+ ts->pcr - ts_st->last_pcr >= ts_st->pcr_period) {
-+ ts_st->last_pcr = ts->pcr;
-+ write_pcr = 1;
+ }
-+ if (write_pcr && ts_st->service->pcr_sid != ts_st->service->pcr_pid) {
-+ /* pcr is on a seperate stream */
-+ mpegts_insert_pcr_only(s, st);
-+ continue;
++ else if (ts_st->pcr_period) {
++ if (pcr >= ts_st->pcr_timer) {
++ ts_st->pcr_timer = pcr + ts_st->pcr_period;
+ write_pcr = 1;
+ }
+ }
+
++ if (write_pcr && ts->pcr_stream_pid >= 0) {
++ mpegts_insert_pcr_only(s, 0);
++ continue;
+ }
+
+ if (ts->mux_rate > 1 && dts != AV_NOPTS_VALUE &&
-+ (dts - ts->pcr / 300) > ts->delay) {
-+ /* pcr insert gets priority over null packet insert */
-+ if (write_pcr)
-+ mpegts_insert_pcr_only(s, st);
++ (dts - pcr / 300) > ts->delay) {
++ /* pcr insert gets priority over null packet insert */
++ if (write_pcr)
++ mpegts_insert_pcr_only(s, st);
+ else
-+ mpegts_insert_null_packet(s);
++ mpegts_insert_null_packet(s);
+ /* recalculate write_pcr and possibly retransimit si_info */
+ continue;
- }
-
++ }
++
/* prepare packet header */
q = buf;
*q++ = 0x47;
- val = ts_st->pid >> 8;
-- if (ts->m2ts_mode && st->codecpar->codec_id == AV_CODEC_ID_AC3)
-- val |= 0x20;
- if (is_start)
- val |= 0x40;
-+ if (ts->m2ts_mode && st->codecpar->codec_id == AV_CODEC_ID_AC3)
-+ val |= 0x20;
- *q++ = val;
- *q++ = ts_st->pid;
- ts_st->cc = ts_st->cc + 1 & 0xf;
-@@ -1250,7 +1236,7 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
- }
- if (key && is_start && pts != AV_NOPTS_VALUE) {
- // set Random Access for key frames
-- if (ts_st->pcr_period)
-+ if ( ts_st->pcr_period > 0 && ts_st->pid == ts_st->service->pcr_sid )
- write_pcr = 1;
- set_af_flag(buf, 0x40);
- q = get_ts_payload_start(buf);
-@@ -1258,10 +1244,9 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
+@@ -1592,7 +1612,6 @@
if (write_pcr) {
set_af_flag(buf, 0x10);
q = get_ts_payload_start(buf);
- // add 11, pcr references the last byte of program clock reference base
-- if (dts != AV_NOPTS_VALUE && dts < pcr / 300)
-+ if (dts != AV_NOPTS_VALUE && dts < ts->pcr / 300)
+ if (dts != AV_NOPTS_VALUE && dts < pcr / 300)
av_log(s, AV_LOG_WARNING, "dts < pcr, TS is invalid\n");
-- extend_af(buf, write_pcr_bits(q, pcr));
-+ extend_af(buf, write_pcr_bits(q, ts->pcr));
- q = get_ts_payload_start(buf);
- }
- if (is_start) {
-@@ -1362,11 +1347,13 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
- *q++ = flags;
- *q++ = header_len;
- if (pts != AV_NOPTS_VALUE) {
-- write_pts(q, flags >> 6, pts);
-+ int64_t ts_pts = pts + ts->ts_offset;
-+ write_pts(q, flags >> 6, ts_pts);
- q += 5;
- }
- if (dts != AV_NOPTS_VALUE && pts != AV_NOPTS_VALUE && dts != pts) {
-- write_pts(q, 1, dts);
-+ int64_t ts_dts = dts + ts->ts_offset;
-+ write_pts(q, 1, ts_dts);
- q += 5;
- }
- if (pes_extension && st->codecpar->codec_id == AV_CODEC_ID_DIRAC) {
-@@ -1536,7 +1523,6 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
+ extend_af(buf, write_pcr_bits(q, pcr));
+@@ -1864,8 +1883,8 @@
uint8_t *data = NULL;
MpegTSWrite *ts = s->priv_data;
MpegTSWriteStream *ts_st = st->priv_data;
- const int64_t delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE) * 2;
- const int64_t max_audio_delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE) / 2;
+- const int64_t max_audio_delay = av_rescale(s->max_delay, 90000, AV_TIME_BASE) / 2;
++ const int64_t delay_ticks2 = ts->delay * 2;
++ const int64_t max_audio_delay = ts->delay / 2;
int64_t dts = pkt->dts, pts = pkt->pts;
int opus_samples = 0;
-@@ -1552,9 +1538,9 @@ static int mpegts_write_packet_internal(AVFormatContext *s, AVPacket *pkt)
+ size_t side_data_size;
+@@ -1885,9 +1904,9 @@
if (ts->copyts < 1) {
if (pts != AV_NOPTS_VALUE)
- pts += delay;
-+ pts += ts->delay * 2;
++ pts += delay_ticks2;
if (dts != AV_NOPTS_VALUE)
- dts += delay;
-+ dts += ts->delay * 2;
++ dts += delay_ticks2;
}
- if (ts_st->first_pts_check && pts == AV_NOPTS_VALUE) {
-@@ -1904,10 +1890,13 @@ static const AVOption options[] = {
- { .i64 = 0x1000 }, FIRST_OTHER_PID, LAST_OTHER_PID, AV_OPT_FLAG_ENCODING_PARAM },
+ if (!ts_st->first_timestamp_checked && (pts == AV_NOPTS_VALUE || dts == AV_NOPTS_VALUE)) {
+@@ -2354,8 +2373,10 @@
+ 0, AV_OPT_TYPE_CONST, { .i64 = MPEGTS_SERVICE_TYPE_HEVC_DIGITAL_HDTV }, 0x01, 0xff, ENC, .unit = "mpegts_service_type" },
+ { "mpegts_pmt_start_pid", "Set the first pid of the PMT.",
+ OFFSET(pmt_start_pid), AV_OPT_TYPE_INT, { .i64 = 0x1000 }, FIRST_OTHER_PID, LAST_OTHER_PID, ENC },
++ { "mpegts_pcr_stream_pid", "create seperate PCR stream on this pid.",
++ OFFSET(pcr_stream_pid), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 0x1f00, ENC },
{ "mpegts_start_pid", "Set the first pid.",
- offsetof(MpegTSWrite, start_pid), AV_OPT_TYPE_INT,
-- { .i64 = 0x0100 }, FIRST_OTHER_PID, LAST_OTHER_PID, AV_OPT_FLAG_ENCODING_PARAM },
-+ { .i64 = -1 }, -1, LAST_OTHER_PID, AV_OPT_FLAG_ENCODING_PARAM },
- { "mpegts_m2ts_mode", "Enable m2ts mode.",
-- offsetof(MpegTSWrite, m2ts_mode), AV_OPT_TYPE_BOOL,
-- { .i64 = -1 }, -1, 1, AV_OPT_FLAG_ENCODING_PARAM },
-+ offsetof(MpegTSWrite, m2ts_mode), AV_OPT_TYPE_INT,
-+ { .i64 = -1 }, -1, 2, AV_OPT_FLAG_ENCODING_PARAM },
-+ { "mpegts_pcr_offset", "clock offset.",
-+ offsetof(MpegTSWrite, ts_offset), AV_OPT_TYPE_BOOL,
-+ { .i64 = 0 }, INT_MIN, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
- { "muxrate", NULL,
- offsetof(MpegTSWrite, mux_rate), AV_OPT_TYPE_INT,
- { .i64 = 1 }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
-@@ -1941,15 +1930,15 @@ static const AVOption options[] = {
- { "omit_video_pes_length", "Omit the PES packet length for video packets",
- offsetof(MpegTSWrite, omit_video_pes_length), AV_OPT_TYPE_BOOL,
- { .i64 = 1 }, 0, 1, AV_OPT_FLAG_ENCODING_PARAM },
-- { "pcr_period", "PCR retransmission time in milliseconds",
-- offsetof(MpegTSWrite, pcr_period_ms), AV_OPT_TYPE_INT,
-- { .i64 = -1 }, -1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
+- OFFSET(start_pid), AV_OPT_TYPE_INT, { .i64 = 0x0100 }, FIRST_OTHER_PID, LAST_OTHER_PID, ENC },
++ OFFSET(start_pid), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, LAST_OTHER_PID, ENC },
+ { "mpegts_m2ts_mode", "Enable m2ts mode.", OFFSET(m2ts_mode), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, ENC },
+ { "muxrate", NULL, OFFSET(mux_rate), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, INT_MAX, ENC },
+ { "pes_payload_size", "Minimum PES packet payload in bytes",
+@@ -2381,10 +2402,10 @@
+ OFFSET(omit_video_pes_length), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, ENC },
+ { "pcr_period", "PCR retransmission time in milliseconds",
+ OFFSET(pcr_period_ms), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, ENC },
- { "pat_period", "PAT/PMT retransmission time limit in seconds",
-- offsetof(MpegTSWrite, pat_period_us), AV_OPT_TYPE_DURATION,
-- { .i64 = PAT_RETRANS_TIME * 1000LL }, 0, INT64_MAX, AV_OPT_FLAG_ENCODING_PARAM },
++ { "pat_period", "PAT/PMT retransmission time limit in ms, -1 no pat",
+ OFFSET(pat_period_us), AV_OPT_TYPE_DURATION, { .i64 = PAT_RETRANS_TIME * 1000LL }, 0, INT64_MAX, ENC },
- { "sdt_period", "SDT retransmission time limit in seconds",
-- offsetof(MpegTSWrite, sdt_period_us), AV_OPT_TYPE_DURATION,
-- { .i64 = SDT_RETRANS_TIME * 1000LL }, 0, INT64_MAX, AV_OPT_FLAG_ENCODING_PARAM },
-+ { "pcr_period", "PCR retransmission time limit in msecs",
-+ offsetof(MpegTSWrite, pcr_period_ms), AV_OPT_TYPE_DOUBLE,
-+ { .dbl = -1 }, -1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
-+ { "pat_period", "PAT/PMT retransmission time limit in msecs",
-+ offsetof(MpegTSWrite, pat_period_ms), AV_OPT_TYPE_DOUBLE,
-+ { .dbl = PAT_RETRANS_TIME }, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
-+ { "sdt_period", "SDT retransmission time limit in msecs",
-+ offsetof(MpegTSWrite, sdt_period_ms), AV_OPT_TYPE_DOUBLE,
-+ { .dbl = SDT_RETRANS_TIME }, -1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM },
+- OFFSET(sdt_period_us), AV_OPT_TYPE_DURATION, { .i64 = SDT_RETRANS_TIME * 1000LL }, 0, INT64_MAX, ENC },
++ { "sdt_period", "SDT retransmission time limit in ms, -1 no sdt",
++ OFFSET(sdt_period_us), AV_OPT_TYPE_INT64, { .i64 = SDT_RETRANS_TIME * 1000LL }, -1, INT64_MAX, ENC },
+ { "nit_period", "NIT retransmission time limit in seconds",
+ OFFSET(nit_period_us), AV_OPT_TYPE_DURATION, { .i64 = NIT_RETRANS_TIME * 1000LL }, 0, INT64_MAX, ENC },
{ NULL },
- };
+--- a/libavformat/mpegts.h
++++ b/libavformat/mpegts.h
+@@ -64,6 +64,7 @@
+ /* PID from 0x1FFC to 0x1FFE may be assigned as needed to PMT, elementary
+ * streams and other data tables */
+ #define NULL_PID 0x1FFF /* Null packet (used for fixed bandwidth padding) */
++#define START_PID 0x0400
+
+ /* m2ts pids */
+ #define M2TS_PMT_PID 0x0100
+--- a/libavformat/bluray.c
++++ b/libavformat/bluray.c
+@@ -27,7 +27,7 @@
+ #include "libavutil/opt.h"
+
+ #define BLURAY_PROTO_PREFIX "bluray:"
+-#define MIN_PLAYLIST_LENGTH 180 /* 3 min */
++#define MIN_PLAYLIST_LENGTH 0
+
+ typedef struct {
+ const AVClass *class;
+
+--- a/doc/muxers.texi
++++ b/doc/muxers.texi
+@@ -2920,7 +2920,8 @@
+ Maximum time in seconds between PAT/PMT tables. Default is @code{0.1}.
+
+ @item sdt_period @var{duration}
+-Maximum time in seconds between SDT tables. Default is @code{0.5}.
++Maximum time in seconds between SDT tables. Default is @code{0.5}. Regardless
++of this setting no SDT is written in m2ts mode.
+ @item nit_period @var{duration}
+ Maximum time in seconds between NIT tables. Default is @code{0.5}.
projects / goodguy / cinelerra.git / blobdiff