Commit 49cfbedb authored by Jai Luthra's avatar Jai Luthra Committed by Paul B Mahol

mlp: check huff_lsbs only when codebook is used

When no codebook is used, huff_lsbs can be more than 24 and still decode to
original values once filters are applied.
Signed-off-by: 's avatarJai Luthra <me@jailuthra.in>
parent d6cef144
......@@ -829,7 +829,7 @@ static int read_channel_params(MLPDecodeContext *m, unsigned int substr,
cp->codebook = get_bits(gbp, 2);
cp->huff_lsbs = get_bits(gbp, 5);
if (cp->huff_lsbs > 24) {
if (cp->codebook > 0 && cp->huff_lsbs > 24) {
av_log(m->avctx, AV_LOG_ERROR, "Invalid huff_lsbs.\n");
cp->huff_lsbs = 0;
return AVERROR_INVALIDDATA;
......
......@@ -987,6 +987,9 @@ static void write_decoding_params(MLPEncodeContext *ctx, PutBitContext *pb,
put_bits(pb, 1, 0);
}
}
if (cp->codebook > 0 && cp->huff_lsbs > 24) {
av_log(ctx->avctx, AV_LOG_ERROR, "Invalid Huff LSBs\n");
}
put_bits(pb, 2, cp->codebook );
put_bits(pb, 5, cp->huff_lsbs);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment