RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-02 18:48:27 +00:00
Code Issues Projects Releases Wiki Activity

avconv: factor out flushing the filters

Browse Source 
This also ensures this is always done, avoiding infinite loops if an
error occurs at the end of the input.
This commit is contained in:
Anton Khirnov 2015-05-06 13:51:43 +02:00
parent e49e0f58e2
commit b114f6d48a
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
avconv.c
View File

@ -1161,13 +1161,8 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
decoded_frame = ist->decoded_frame; decoded_frame = ist->decoded_frame;
ret = avcodec_decode_audio4(avctx, decoded_frame, got_output, pkt); ret = avcodec_decode_audio4(avctx, decoded_frame, got_output, pkt);
if (!*got_output || ret < 0) { if (!*got_output || ret < 0)
if (!pkt->size) {
for (i = 0; i < ist->nb_filters; i++)
av_buffersrc_add_frame(ist->filters[i]->filter, NULL);
}
return ret; return ret;
}
ist->samples_decoded += decoded_frame->nb_samples; ist->samples_decoded += decoded_frame->nb_samples;
ist->frames_decoded++; ist->frames_decoded++;
@ -1257,13 +1252,8 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output)
ret = avcodec_decode_video2(ist->dec_ctx, ret = avcodec_decode_video2(ist->dec_ctx,
decoded_frame, got_output, pkt); decoded_frame, got_output, pkt);
if (!*got_output || ret < 0) { if (!*got_output || ret < 0)
if (!pkt->size) {
for (i = 0; i < ist->nb_filters; i++)
av_buffersrc_add_frame(ist->filters[i]->filter, NULL);
}
return ret; return ret;
}
ist->frames_decoded++; ist->frames_decoded++;
@ -1356,6 +1346,17 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output)
return ret; return ret;
} }
static int send_filter_eof(InputStream *ist)
{
int i, ret;
for (i = 0; i < ist->nb_filters; i++) {
ret = av_buffersrc_add_frame(ist->filters[i]->filter, NULL);
if (ret < 0)
return ret;
}
return 0;
}
/* pkt = NULL means EOF (needed to flush decoder buffers) */ /* pkt = NULL means EOF (needed to flush decoder buffers) */
static int process_input_packet(InputStream *ist, const AVPacket *pkt) static int process_input_packet(InputStream *ist, const AVPacket *pkt)
{ {
@ -1429,6 +1430,15 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt)
} }
} }
/* after flushing, send an EOF on all the filter inputs attached to the stream */
if (!pkt && ist->decoding_needed) {
int ret = send_filter_eof(ist);
if (ret < 0) {
av_log(NULL, AV_LOG_FATAL, "Error marking filters as finished\n");
exit_program(1);
}
}
/* handle stream copy */ /* handle stream copy */
if (!ist->decoding_needed) { if (!ist->decoding_needed) {
ist->last_dts = ist->next_dts; ist->last_dts = ist->next_dts;