diff options
| -rw-r--r-- | fftools/ffmpeg.h | 5 | ||||
| -rw-r--r-- | fftools/ffmpeg_mux.c | 4 | ||||
| -rw-r--r-- | fftools/ffmpeg_mux.h | 5 | ||||
| -rw-r--r-- | fftools/ffmpeg_mux_init.c | 10 |
4 files changed, 13 insertions, 11 deletions
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 6ad3245166..e626fac18a 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -598,11 +598,6 @@ typedef struct OutputStream { /* dts of the last packet sent to the muxing queue, in AV_TIME_BASE_Q */ int64_t last_mux_dts; - // timestamp from which the streamcopied streams should start, - // in AV_TIME_BASE_Q; - // everything before it should be discarded - int64_t ts_copy_start; - // the timebase of the packets sent to the muxer AVRational mux_timebase; AVRational enc_timebase; diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c index 8c710c2eac..d832116c12 100644 --- a/fftools/ffmpeg_mux.c +++ b/fftools/ffmpeg_mux.c @@ -400,8 +400,8 @@ void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts) if (!ost->streamcopy_started) { if (!ost->copy_prior_start && (pkt->pts == AV_NOPTS_VALUE ? - dts < ost->ts_copy_start : - pkt->pts < av_rescale_q(ost->ts_copy_start, AV_TIME_BASE_Q, pkt->time_base))) + dts < ms->ts_copy_start : + pkt->pts < av_rescale_q(ms->ts_copy_start, AV_TIME_BASE_Q, pkt->time_base))) return; if (of->start_time != AV_NOPTS_VALUE && dts < of->start_time) diff --git a/fftools/ffmpeg_mux.h b/fftools/ffmpeg_mux.h index e8c4ea4847..25cf1b547f 100644 --- a/fftools/ffmpeg_mux.h +++ b/fftools/ffmpeg_mux.h @@ -60,6 +60,11 @@ typedef struct MuxStream { /* Threshold after which max_muxing_queue_size will be in effect */ size_t muxing_queue_data_threshold; + // timestamp from which the streamcopied streams should start, + // in AV_TIME_BASE_Q; + // everything before it should be discarded + int64_t ts_copy_start; + /* dts of the last packet sent to the muxer, in the stream timebase * used for making up missing dts values */ int64_t last_mux_dts; diff --git a/fftools/ffmpeg_mux_init.c b/fftools/ffmpeg_mux_init.c index 64a3e1ffe5..555ccfd796 100644 --- a/fftools/ffmpeg_mux_init.c +++ b/fftools/ffmpeg_mux_init.c @@ -841,6 +841,8 @@ static void new_stream_subtitle(Muxer *mux, const OptionsContext *o, static int streamcopy_init(const Muxer *mux, const OptionsContext *o, OutputStream *ost) { + MuxStream *ms = ms_from_ost(ost); + const InputStream *ist = ost->ist; const InputFile *ifile = input_files[ist->file_index]; @@ -907,11 +909,11 @@ static int streamcopy_init(const Muxer *mux, const OptionsContext *o, ost->st->duration = av_rescale_q(ist->st->duration, ist->st->time_base, ost->st->time_base); if (!ost->copy_prior_start) { - ost->ts_copy_start = (mux->of.start_time == AV_NOPTS_VALUE) ? - 0 : mux->of.start_time; + ms->ts_copy_start = (mux->of.start_time == AV_NOPTS_VALUE) ? + 0 : mux->of.start_time; if (copy_ts && ifile->start_time != AV_NOPTS_VALUE) { - ost->ts_copy_start = FFMAX(ost->ts_copy_start, - ifile->start_time + ifile->ts_offset); + ms->ts_copy_start = FFMAX(ms->ts_copy_start, + ifile->start_time + ifile->ts_offset); } } |