virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

fftools/ffmpeg: move checking for input -t out of do_streamcopy()

Browse Source 
This check is entirely about the properties of the input stream, while
do_streamcopy() should contain code specific to a given output stream.
This commit is contained in:
Anton Khirnov 2023-04-03 13:47:12 +02:00
parent 0feff04956
commit 106eb58ceb
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fftools/ffmpeg.c
View File

@ -944,7 +944,6 @@ int ifilter_parameters_from_codecpar(InputFilter *ifilter, AVCodecParameters *pa
static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *pkt)
{
OutputFile *of = output_files[ost->file_index];
InputFile *f = input_files [ist->file_index];
int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;
int64_t ost_tb_start_time = av_rescale_q(start_time, AV_TIME_BASE_Q, ost->mux_timebase);
AVPacket *opkt = ost->pkt;
@ -977,18 +976,6 @@ static void do_streamcopy(InputStream *ist, OutputStream *ost, const AVPacket *p
return;
}
if (f->recording_time != INT64_MAX) {
start_time = 0;
if (copy_ts) {
start_time += f->start_time != AV_NOPTS_VALUE ? f->start_time : 0;
start_time += start_at_zero ? 0 : f->start_time_effective;
}
if (ist->pts >= f->recording_time + start_time) {
close_output_stream(ost);
return;
}
}
if (av_packet_ref(opkt, pkt) < 0)
exit_program(1);
@ -1636,10 +1623,12 @@ static int send_filter_eof(InputStream *ist)
/* pkt = NULL means EOF (needed to flush decoder buffers) */
static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eof)
{
InputFile *f = input_files[ist->file_index];
const AVCodecParameters *par = ist->par;
int ret = 0;
int repeating = 0;
int eof_reached = 0;
int duration_exceeded;
AVPacket *avpkt = ist->pkt;
@ -1814,11 +1803,27 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo
} else if (!ist->decoding_needed)
eof_reached = 1;
duration_exceeded = 0;
if (f->recording_time != INT64_MAX) {
int64_t start_time = 0;
if (copy_ts) {
start_time += f->start_time != AV_NOPTS_VALUE ? f->start_time : 0;
start_time += start_at_zero ? 0 : f->start_time_effective;
}
if (ist->pts >= f->recording_time + start_time)
duration_exceeded = 1;
}
for (int oidx = 0; oidx < ist->nb_outputs; oidx++) {
OutputStream *ost = ist->outputs[oidx];
if (ost->enc_ctx || (!pkt && no_eof))
continue;
if (duration_exceeded) {
close_output_stream(ost);
continue;
}
do_streamcopy(ist, ost, pkt);
}