Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avcodec/ffv1: simplify version checks with combined_version

Browse source 
Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2025-01-18 01:49:38 +01:00
parent c0769e9213
commit 0c237d6e8a
No known key found for this signature in database
GPG key ID: B18E8928B3948D64
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libavcodec/ffv1.c
View file

@ -130,7 +130,7 @@ int ff_slice_coord(const FFV1Context *f, int width, int sx, int num_h_slices, in
int mpw = 1<<chroma_shift; int mpw = 1<<chroma_shift;
int awidth = FFALIGN(width, mpw); int awidth = FFALIGN(width, mpw);
if (f->version < 4 || f->version == 4 && f->micro_version < 3) if (f->combined_version <= 0x40002)
return width * sx / num_h_slices; return width * sx / num_h_slices;
sx = (2LL * awidth * sx + num_h_slices * mpw) / (2 * num_h_slices * mpw) * mpw; sx = (2LL * awidth * sx + num_h_slices * mpw) / (2 * num_h_slices * mpw) * mpw;

1
libavcodec/ffv1.h
View file

@ -113,6 +113,7 @@ typedef struct FFV1Context {
uint64_t (*rc_stat2[MAX_QUANT_TABLES])[32][2]; uint64_t (*rc_stat2[MAX_QUANT_TABLES])[32][2];
int version; int version;
int micro_version; int micro_version;
int combined_version;
int width, height; int width, height;
int chroma_planes; int chroma_planes;
int chroma_h_shift, chroma_v_shift; int chroma_h_shift, chroma_v_shift;

9
libavcodec/ffv1dec.c
View file

@ -307,7 +307,7 @@ static int decode_slice(AVCodecContext *c, void *arg)
y = sc->slice_y; y = sc->slice_y;
if (ac == AC_GOLOMB_RICE) { if (ac == AC_GOLOMB_RICE) {
if (f->version == 3 && f->micro_version > 1 || f->version > 3) if (f->combined_version >= 0x30002)
get_rac(&sc->c, (uint8_t[]) { 129 }); get_rac(&sc->c, (uint8_t[]) { 129 });
sc->ac_byte_count = f->version > 2 || (!x && !y) ? sc->c.bytestream - sc->c.bytestream_start - 1 : 0; sc->ac_byte_count = f->version > 2 || (!x && !y) ? sc->c.bytestream - sc->c.bytestream_start - 1 : 0;
init_get_bits(&gb, init_get_bits(&gb,
@ -433,11 +433,13 @@ static int read_extra_header(FFV1Context *f)
f->version); f->version);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
f->combined_version = f->version << 16;
if (f->version > 2) { if (f->version > 2) {
c.bytestream_end -= 4; c.bytestream_end -= 4;
f->micro_version = get_symbol(&c, state, 0); f->micro_version = get_symbol(&c, state, 0);
if (f->micro_version < 0) if (f->micro_version < 0 || f->micro_version > 65535)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
f->combined_version += f->micro_version;
} }
f->ac = get_symbol(&c, state, 0); f->ac = get_symbol(&c, state, 0);
@ -505,7 +507,7 @@ static int read_extra_header(FFV1Context *f)
f->ec = get_symbol(&c, state, 0); f->ec = get_symbol(&c, state, 0);
if (f->ec >= 2) if (f->ec >= 2)
f->crcref = 0x7a8c4079; f->crcref = 0x7a8c4079;
if (f->micro_version > 2) if (f->combined_version >= 0x30003)
f->intra = get_symbol(&c, state, 0); f->intra = get_symbol(&c, state, 0);
} }
@ -1104,6 +1106,7 @@ static int update_thread_context(AVCodecContext *dst, const AVCodecContext *src)
fdst->version = fsrc->version; fdst->version = fsrc->version;
fdst->micro_version = fsrc->micro_version; fdst->micro_version = fsrc->micro_version;
fdst->combined_version = fsrc->combined_version;
fdst->chroma_planes = fsrc->chroma_planes; fdst->chroma_planes = fsrc->chroma_planes;
fdst->chroma_h_shift = fsrc->chroma_h_shift; fdst->chroma_h_shift = fsrc->chroma_h_shift;
fdst->chroma_v_shift = fsrc->chroma_v_shift; fdst->chroma_v_shift = fsrc->chroma_v_shift;

2
libavcodec/ffv1enc.c
View file

@ -414,11 +414,13 @@ av_cold int ff_ffv1_write_extradata(AVCodecContext *avctx)
ff_build_rac_states(&c, 0.05 * (1LL << 32), 256 - 8); ff_build_rac_states(&c, 0.05 * (1LL << 32), 256 - 8);
put_symbol(&c, state, f->version, 0); put_symbol(&c, state, f->version, 0);
f->combined_version = f->version << 16;
if (f->version > 2) { if (f->version > 2) {
if (f->version == 3) { if (f->version == 3) {
f->micro_version = 4; f->micro_version = 4;
} else if (f->version == 4) } else if (f->version == 4)
f->micro_version = 3; f->micro_version = 3;
f->combined_version += f->micro_version;
put_symbol(&c, state, f->micro_version, 0); put_symbol(&c, state, f->micro_version, 0);
} }