ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 05:16:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fftools/ffmpeg_dec: merge check_decode_result() into its callers

Browse Source 
Not only is this easier to read, this also makes the code shorter.
This commit is contained in:
Anton Khirnov 2023-05-17 11:49:01 +02:00
parent c08717adae
commit ab3493006f
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fftools/ffmpeg_dec.c
View File

@ -31,24 +31,6 @@
#include "ffmpeg.h"
static void check_decode_result(InputStream *ist, int got_output, int ret)
{
if (ret < 0)
ist->decode_errors++;
if (ret < 0 && exit_on_error)
exit_program(1);
if (got_output && ist->dec_ctx->codec_type != AVMEDIA_TYPE_SUBTITLE) {
if (ist->decoded_frame->decode_error_flags || (ist->decoded_frame->flags & AV_FRAME_FLAG_CORRUPT)) {
av_log(ist, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING,
"corrupt decoded frame\n");
if (exit_on_error)
exit_program(1);
}
}
}
static int send_frame_to_filters(InputStream *ist, AVFrame *decoded_frame)
{
int i, ret;
@ -385,10 +367,9 @@ static int transcode_subtitles(InputStream *ist, const AVPacket *pkt)
av_err2str(ret));
if (exit_on_error)
exit_program(1);
ist->decode_errors++;
}
check_decode_result(ist, got_output, ret);
if (ret < 0 || !got_output) {
if (!pkt->size)
sub2video_flush(ist);
@ -452,9 +433,6 @@ int dec_packet(InputStream *ist, const AVPacket *pkt, int no_eof)
update_benchmark("decode_%s %d.%d", type_desc,
ist->file_index, ist->st->index);
if (ret != AVERROR_EOF && ret != AVERROR(EAGAIN))
check_decode_result(ist, ret >= 0, ret);
if (ret == AVERROR(EAGAIN)) {
av_assert0(pkt); // should never happen during flushing
return 0;
@ -474,9 +452,17 @@ int dec_packet(InputStream *ist, const AVPacket *pkt, int no_eof)
av_log(ist, AV_LOG_ERROR, "Decoding error: %s\n", av_err2str(ret));
if (exit_on_error)
exit_program(1);
ist->decode_errors++;
return ret;
}
if (frame->decode_error_flags || (frame->flags & AV_FRAME_FLAG_CORRUPT)) {
av_log(ist, exit_on_error ? AV_LOG_FATAL : AV_LOG_WARNING,
"corrupt decoded frame\n");
if (exit_on_error)
exit_program(1);
}
if (ist->want_frame_data) {
FrameData *fd;