diff options
| author | Marton Balint <cus@passwd.hu> | 2015-10-15 00:48:24 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2015-10-22 05:07:46 +0200 |
| commit | b69b43e2c471c4febbffaf313875396256b6a51e (patch) | |
| tree | a2776ba9951420790275245eef76989e2dd58617 /ffmpeg.c | |
| parent | e2b416b68e85f3495d1a55f202dd405824c044c8 (diff) | |
ffmpeg: exit on corrupt packets or decoded frames if exit_on_error flag is present
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'ffmpeg.c')
| -rw-r--r-- | ffmpeg.c | 20 |
1 files changed, 16 insertions, 4 deletions
@@ -1925,13 +1925,20 @@ int guess_input_channel_layout(InputStream *ist) return 1; } -static void check_decode_result(int *got_output, int ret) +static void check_decode_result(InputStream *ist, int *got_output, int ret) { if (*got_output || ret<0) decode_error_stat[ret<0] ++; if (ret < 0 && exit_on_error) exit_program(1); + + if (exit_on_error && *got_output && ist) { + if (av_frame_get_decode_error_flags(ist->decoded_frame) || (ist->decoded_frame->flags & AV_FRAME_FLAG_CORRUPT)) { + av_log(NULL, AV_LOG_FATAL, "%s: corrupt decoded frame in stream %d\n", input_files[ist->file_index]->ctx->filename, ist->st->index); + exit_program(1); + } + } } static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output) @@ -1956,7 +1963,7 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output) ret = AVERROR_INVALIDDATA; } - check_decode_result(got_output, ret); + check_decode_result(ist, got_output, ret); if (!*got_output || ret < 0) return ret; @@ -2093,7 +2100,7 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output) ist->st->codec->has_b_frames); } - check_decode_result(got_output, ret); + check_decode_result(ist, got_output, ret); if (*got_output && ret >= 0) { if (ist->dec_ctx->width != decoded_frame->width || @@ -2201,7 +2208,7 @@ static int transcode_subtitles(InputStream *ist, AVPacket *pkt, int *got_output) int i, ret = avcodec_decode_subtitle2(ist->dec_ctx, &subtitle, got_output, pkt); - check_decode_result(got_output, ret); + check_decode_result(NULL, got_output, ret); if (ret < 0 || !*got_output) { if (!pkt->size) @@ -3770,6 +3777,11 @@ static int process_input(int file_index) if (ist->discard) goto discard_packet; + if (exit_on_error && (pkt.flags & AV_PKT_FLAG_CORRUPT)) { + av_log(NULL, AV_LOG_FATAL, "%s: corrupt input packet in stream %d\n", is->filename, pkt.stream_index); + exit_program(1); + } + if (debug_ts) { av_log(NULL, AV_LOG_INFO, "demuxer -> ist_index:%d type:%s " "next_dts:%s next_dts_time:%s next_pts:%s next_pts_time:%s pkt_pts:%s pkt_pts_time:%s pkt_dts:%s pkt_dts_time:%s off:%s off_time:%s\n", |