har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/cfhd: check if band encoding is valid

Browse Source 
Also simplify lossless check as value of 5 for band encoding
always specify lossless mode.
This commit is contained in:
Paul B Mahol 2020-08-09 11:00:07 +02:00
parent 9ce787d61e
commit 8c7ea0c344
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/cfhd.c
View File

@ -523,6 +523,11 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
s->prescale_shift[2] = (data >> 6) & 0x7; s->prescale_shift[2] = (data >> 6) & 0x7;
av_log(avctx, AV_LOG_DEBUG, "Prescale shift (VC-5): %x\n", data); av_log(avctx, AV_LOG_DEBUG, "Prescale shift (VC-5): %x\n", data);
} else if (tag == BandEncoding) { } else if (tag == BandEncoding) {
if (!data || data > 5) {
av_log(avctx, AV_LOG_ERROR, "Invalid band encoding\n");
ret = AVERROR(EINVAL);
break;
}
s->band_encoding = data; s->band_encoding = data;
av_log(avctx, AV_LOG_DEBUG, "Encode Method for Subband %d : %x\n", s->subband_num_actual, data); av_log(avctx, AV_LOG_DEBUG, "Encode Method for Subband %d : %x\n", s->subband_num_actual, data);
} else if (tag == LowpassWidth) { } else if (tag == LowpassWidth) {
@ -814,8 +819,7 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
{ {
OPEN_READER(re, &s->gb); OPEN_READER(re, &s->gb);
const int lossless = (s->sample_type == 2 || s->sample_type == 3 || s->frame_type) && const int lossless = s->band_encoding == 5;
s->subband_num_actual == 7 && s->band_encoding == 5;
if (s->codebook == 0 && s->transform_type == 2 && s->subband_num_actual == 7) if (s->codebook == 0 && s->transform_type == 2 && s->subband_num_actual == 7)
s->codebook = 1; s->codebook = 1;