virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

avcodec/mpeg12dec: report error when picture type is unknown and err_detect is EXPLODE

Browse Source 
Also split error message to error and warning.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2021-08-01 03:51:58 +02:00
parent 188e17ac85
commit a2690dccca
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/mpeg12dec.c
View File

@ -1529,7 +1529,7 @@ static void mpeg_decode_quant_matrix_extension(MpegEncContext *s)
load_matrix(s, s->chroma_inter_matrix, NULL, 0); load_matrix(s, s->chroma_inter_matrix, NULL, 0);
} }
static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1) static int mpeg_decode_picture_coding_extension(Mpeg1Context *s1)
{ {
MpegEncContext *s = &s1->mpeg_enc_ctx; MpegEncContext *s = &s1->mpeg_enc_ctx;
@ -1539,8 +1539,10 @@ static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1)
s->mpeg_f_code[1][0] = get_bits(&s->gb, 4); s->mpeg_f_code[1][0] = get_bits(&s->gb, 4);
s->mpeg_f_code[1][1] = get_bits(&s->gb, 4); s->mpeg_f_code[1][1] = get_bits(&s->gb, 4);
if (!s->pict_type && s1->mpeg_enc_ctx_allocated) { if (!s->pict_type && s1->mpeg_enc_ctx_allocated) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR, "Missing picture start code\n");
"Missing picture start code, guessing missing values\n"); if (s->avctx->err_recognition & AV_EF_EXPLODE)
return AVERROR_INVALIDDATA;
av_log(s->avctx, AV_LOG_WARNING, "Guessing pict_type from mpeg_f_code\n");
if (s->mpeg_f_code[1][0] == 15 && s->mpeg_f_code[1][1] == 15) { if (s->mpeg_f_code[1][0] == 15 && s->mpeg_f_code[1][1] == 15) {
if (s->mpeg_f_code[0][0] == 15 && s->mpeg_f_code[0][1] == 15) if (s->mpeg_f_code[0][0] == 15 && s->mpeg_f_code[0][1] == 15)
s->pict_type = AV_PICTURE_TYPE_I; s->pict_type = AV_PICTURE_TYPE_I;
@ -1586,6 +1588,8 @@ static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1)
ff_dlog(s->avctx, "alternate_scan=%d\n", s->alternate_scan); ff_dlog(s->avctx, "alternate_scan=%d\n", s->alternate_scan);
ff_dlog(s->avctx, "frame_pred_frame_dct=%d\n", s->frame_pred_frame_dct); ff_dlog(s->avctx, "frame_pred_frame_dct=%d\n", s->frame_pred_frame_dct);
ff_dlog(s->avctx, "progressive_frame=%d\n", s->progressive_frame); ff_dlog(s->avctx, "progressive_frame=%d\n", s->progressive_frame);
return 0;
} }
static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size)
@ -2599,7 +2603,9 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture,
break; break;
case 0x8: case 0x8:
if (last_code == PICTURE_START_CODE) { if (last_code == PICTURE_START_CODE) {
mpeg_decode_picture_coding_extension(s); int ret = mpeg_decode_picture_coding_extension(s);
if (ret < 0)
return ret;
} else { } else {
av_log(avctx, AV_LOG_ERROR, av_log(avctx, AV_LOG_ERROR,
"ignoring pic cod ext after %X\n", last_code); "ignoring pic cod ext after %X\n", last_code);