virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/ffv1dec: compute end instead of hardcoding it and test for fltmap correctly

Browse Source 
A step toward supporting remap for integer formats less than 16 bit

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2025-03-24 16:00:02 +01:00
parent 3813559660
commit 5ca14b23f1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/ffv1dec.c
View File

@@ -286,7 +286,7 @@ static int decode_current_mul(RangeCoder *rc, uint8_t state[32], int *mul, int m
static int decode_remap(FFV1Context *f, FFV1SliceContext *sc) static int decode_remap(FFV1Context *f, FFV1SliceContext *sc)
{ {
unsigned int end = f->avctx->bits_per_raw_sample == 32 ? 0xFFFFFFFF : 0xFFFF; unsigned int end = (1LL<<f->avctx->bits_per_raw_sample) - 1;
int flip = sc->remap == 2 ? (end>>1) : 0; int flip = sc->remap == 2 ? (end>>1) : 0;
for (int p= 0; p < 1 + 2*f->chroma_planes + f->transparency; p++) { for (int p= 0; p < 1 + 2*f->chroma_planes + f->transparency; p++) {
@@ -328,7 +328,7 @@ static int decode_remap(FFV1Context *f, FFV1SliceContext *sc)
break; break;
if (i - 1 > end || j > 65535) if (i - 1 > end || j > 65535)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (end == 0xFFFF) { if (end <= 0xFFFF) {
sc->fltmap [p][j++] = i ^ ((i& 0x8000) ? 0 : flip); sc->fltmap [p][j++] = i ^ ((i& 0x8000) ? 0 : flip);
} else } else
sc->fltmap32[p][j++] = i ^ ((i&0x80000000) ? 0 : flip); sc->fltmap32[p][j++] = i ^ ((i&0x80000000) ? 0 : flip);