RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc: change all decoders to behave consistently with AV_EF_CRCCHECK. 

Just crccheck prints a warning, crccheck+explode returns an error.

Also document this behavior.
This commit is contained in:
Anton Khirnov 2013-10-26 22:46:48 +02:00
parent f354f30836
commit 23a211cbba
6 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ac3dec.c
View File

@ -1330,6 +1330,8 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data,
if (av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, &buf[2], if (av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, &buf[2],
s->frame_size - 2)) { s->frame_size - 2)) {
av_log(avctx, AV_LOG_ERROR, "frame CRC mismatch\n"); av_log(avctx, AV_LOG_ERROR, "frame CRC mismatch\n");
if (avctx->err_recognition & AV_EF_EXPLODE)
return AVERROR_INVALIDDATA;
err = AAC_AC3_PARSE_ERROR_CRC; err = AAC_AC3_PARSE_ERROR_CRC;
} }
} }

2
libavcodec/alsdec.c
View File

@ -1545,6 +1545,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
if (ctx->cur_frame_length != sconf->frame_length && if (ctx->cur_frame_length != sconf->frame_length &&
ctx->crc_org != ctx->crc) { ctx->crc_org != ctx->crc) {
av_log(avctx, AV_LOG_ERROR, "CRC error.\n"); av_log(avctx, AV_LOG_ERROR, "CRC error.\n");
if (avctx->err_recognition & AV_EF_EXPLODE)
return AVERROR_INVALIDDATA;
} }
} }

7
libavcodec/avcodec.h
View File

@ -2332,6 +2332,13 @@ typedef struct AVCodecContext {
* - decoding: Set by user. * - decoding: Set by user.
*/ */
int err_recognition; int err_recognition;
/**
* Verify checksums embedded in the bitstream (could be of either encoded or
* decoded data, depending on the codec) and print an error message on mismatch.
* If AV_EF_EXPLODE is also set, a mismatching checksum will result in the
* decoder returning an error.
*/
#define AV_EF_CRCCHECK (1<<0) #define AV_EF_CRCCHECK (1<<0)
#define AV_EF_BITSTREAM (1<<1) #define AV_EF_BITSTREAM (1<<1)
#define AV_EF_BUFFER (1<<2) #define AV_EF_BUFFER (1<<2)

6
libavcodec/takdec.c
View File

@ -693,7 +693,8 @@ static int tak_decode_frame(AVCodecContext *avctx, void *data,
if (avctx->err_recognition & AV_EF_CRCCHECK) { if (avctx->err_recognition & AV_EF_CRCCHECK) {
if (ff_tak_check_crc(pkt->data, hsize)) { if (ff_tak_check_crc(pkt->data, hsize)) {
av_log(avctx, AV_LOG_ERROR, "CRC error\n"); av_log(avctx, AV_LOG_ERROR, "CRC error\n");
return AVERROR_INVALIDDATA; if (avctx->err_recognition & AV_EF_EXPLODE)
return AVERROR_INVALIDDATA;
} }
} }
@ -867,7 +868,8 @@ static int tak_decode_frame(AVCodecContext *avctx, void *data,
if (ff_tak_check_crc(pkt->data + hsize, if (ff_tak_check_crc(pkt->data + hsize,
get_bits_count(gb) / 8 - hsize)) { get_bits_count(gb) / 8 - hsize)) {
av_log(avctx, AV_LOG_ERROR, "CRC error\n"); av_log(avctx, AV_LOG_ERROR, "CRC error\n");
return AVERROR_INVALIDDATA; if (avctx->err_recognition & AV_EF_EXPLODE)
return AVERROR_INVALIDDATA;
} }
} }

6
libavcodec/tta.c
View File

@ -275,7 +275,8 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)
avctx->extradata_size - 26 < total_frames * 4) avctx->extradata_size - 26 < total_frames * 4)
av_log(avctx, AV_LOG_WARNING, "Seek table missing or too small\n"); av_log(avctx, AV_LOG_WARNING, "Seek table missing or too small\n");
else if (avctx->err_recognition & AV_EF_CRCCHECK) { else if (avctx->err_recognition & AV_EF_CRCCHECK) {
if (tta_check_crc(s, avctx->extradata + 22, total_frames * 4)) int ret = tta_check_crc(s, avctx->extradata + 22, total_frames * 4);
if (ret < 0 && avctx->err_recognition & AV_EF_EXPLODE)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
skip_bits_long(&s->gb, 32 * total_frames); skip_bits_long(&s->gb, 32 * total_frames);
@ -316,7 +317,8 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data,
int32_t *p; int32_t *p;
if (avctx->err_recognition & AV_EF_CRCCHECK) { if (avctx->err_recognition & AV_EF_CRCCHECK) {
if (buf_size < 4 || tta_check_crc(s, buf, buf_size - 4)) if (buf_size < 4 ||
(tta_check_crc(s, buf, buf_size - 4) && avctx->err_recognition & AV_EF_EXPLODE))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }

8
libavcodec/wavpack.c
View File

@ -699,9 +699,11 @@ static inline int wv_unpack_mono(WavpackFrameContext *s, GetBitContext *gb,
} while (!last && count < s->samples); } while (!last && count < s->samples);
wv_reset_saved_context(s); wv_reset_saved_context(s);
if ((s->avctx->err_recognition & AV_EF_CRCCHECK) && if (s->avctx->err_recognition & AV_EF_CRCCHECK) {
wv_check_crc(s, crc, crc_extra_bits)) int ret = wv_check_crc(s, crc, crc_extra_bits);
return AVERROR_INVALIDDATA; if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE)
return ret;
}
return 0; return 0;
} }