RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_mux: make ts_copy_start private to muxing code 

It is no longer used outside of ffmpeg_mux*
This commit is contained in:
Anton Khirnov 2023-04-13 14:45:58 +02:00
parent 3f11582ca3
commit 83646146fe
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fftools/ffmpeg.h
View File

@ -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;

4
fftools/ffmpeg_mux.c
View File

@ -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)

5
fftools/ffmpeg_mux.h
View File

@ -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;

10
fftools/ffmpeg_mux_init.c
View File

@ -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);
}
}