diff mbox series

[FFmpeg-devel,17/39] lavc/ffv1: always use the main context values of ac

Message ID 20240716171155.31838-17-anton@khirnov.net
State New
Headers show
Series [FFmpeg-devel,01/39] tests/fate/vcodec: add vsynth tests for FFV1 version 2 | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Anton Khirnov July 16, 2024, 5:11 p.m. UTC 
It cannot change between slices.
---
 libavcodec/ffv1.c             |  6 +++---
 libavcodec/ffv1dec.c          | 14 ++++++--------
 libavcodec/ffv1dec_template.c |  6 +++---
 libavcodec/ffv1enc.c          |  6 +++---
 libavcodec/ffv1enc_template.c |  4 ++--
 5 files changed, 17 insertions(+), 19 deletions(-)

Comments

Michael Niedermayer July 24, 2024, 7:23 p.m. UTC | #1 
On Tue, Jul 16, 2024 at 07:11:32PM +0200, Anton Khirnov wrote:
> It cannot change between slices.

that is true currently but considering that its used in some of the inner loops
i dont think carrying an additional pointer around into these loops makes
sense
either leave it or move the ac value to teh stack for these functions

thx

[...]
diff mbox series

Patch

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 06a77c3a26..581e775ae2 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -59,7 +59,7 @@  av_cold int ff_ffv1_init_slice_state(const FFV1Context *f, FFV1Context *fs)
     for (j = 0; j < f->plane_count; j++) {
         PlaneContext *const p = &fs->plane[j];
 
-        if (fs->ac != AC_GOLOMB_RICE) {
+        if (f->ac != AC_GOLOMB_RICE) {
             if (!p->state)
                 p->state = av_malloc_array(p->context_count, CONTEXT_SIZE *
                                      sizeof(uint8_t));
@@ -78,7 +78,7 @@  av_cold int ff_ffv1_init_slice_state(const FFV1Context *f, FFV1Context *fs)
         }
     }
 
-    if (fs->ac == AC_RANGE_CUSTOM_TAB) {
+    if (f->ac == AC_RANGE_CUSTOM_TAB) {
         //FIXME only redo if state_transition changed
         for (j = 1; j < 256; j++) {
             fs->c. one_state[      j] = f->state_transition[j];
@@ -167,7 +167,7 @@  void ff_ffv1_clear_slice_state(const FFV1Context *f, FFV1Context *fs)
     for (i = 0; i < f->plane_count; i++) {
         PlaneContext *p = &fs->plane[i];
 
-        if (fs->ac != AC_GOLOMB_RICE) {
+        if (f->ac != AC_GOLOMB_RICE) {
             if (f->initial_states[p->quant_table_index]) {
                 memcpy(p->state, f->initial_states[p->quant_table_index],
                        CONTEXT_SIZE * p->context_count);
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c
index 8464697fd3..133baa895a 100644
--- a/libavcodec/ffv1dec.c
+++ b/libavcodec/ffv1dec.c
@@ -94,10 +94,9 @@  static inline int get_vlc_symbol(GetBitContext *gb, VlcState *const state,
     return ret;
 }
 
-static int is_input_end(FFV1Context *s, GetBitContext *gb)
+static int is_input_end(RangeCoder *c, GetBitContext *gb, int ac)
 {
-    if (s->ac != AC_GOLOMB_RICE) {
-        RangeCoder *const c = &s->c;
+    if (ac != AC_GOLOMB_RICE) {
         if (c->overread > MAX_OVERREAD)
             return AVERROR_INVALIDDATA;
     } else {
@@ -197,7 +196,7 @@  static int decode_slice_header(const FFV1Context *f, FFV1Context *fs,
     av_assert0 (   (unsigned)sc->slice_x + (uint64_t)sc->slice_width  <= f->width
                 && (unsigned)sc->slice_y + (uint64_t)sc->slice_height <= f->height);
 
-    if (fs->ac == AC_GOLOMB_RICE && sc->slice_width >= (1<<23))
+    if (f->ac == AC_GOLOMB_RICE && sc->slice_width >= (1<<23))
         return AVERROR_INVALIDDATA;
 
     for (unsigned i = 0; i < f->plane_count; i++) {
@@ -284,7 +283,7 @@  static int decode_slice(AVCodecContext *c, void *arg)
             pdst->state = NULL;
             pdst->vlc_state = NULL;
 
-            if (fssrc->ac) {
+            if (f->ac) {
                 pdst->state = av_malloc_array(CONTEXT_SIZE,  psrc->context_count);
                 memcpy(pdst->state, psrc->state, CONTEXT_SIZE * psrc->context_count);
             } else {
@@ -319,7 +318,7 @@  static int decode_slice(AVCodecContext *c, void *arg)
     x      = sc->slice_x;
     y      = sc->slice_y;
 
-    if (fs->ac == AC_GOLOMB_RICE) {
+    if (f->ac == AC_GOLOMB_RICE) {
         if (f->version == 3 && f->micro_version > 1 || f->version > 3)
             get_rac(&fs->c, (uint8_t[]) { 129 });
         fs->ac_byte_count = f->version > 2 || (!x && !y) ? fs->c.bytestream - fs->c.bytestream_start - 1 : 0;
@@ -358,7 +357,7 @@  static int decode_slice(AVCodecContext *c, void *arg)
                                p->data[3] + ps * x + y * p->linesize[3] };
         decode_rgb_frame(f, fs, sc, &gb, planes, width, height, p->linesize);
     }
-    if (fs->ac != AC_GOLOMB_RICE && f->version > 2) {
+    if (f->ac != AC_GOLOMB_RICE && f->version > 2) {
         int v;
         get_rac(&fs->c, (uint8_t[]) { 129 });
         v = fs->c.bytestream_end - fs->c.bytestream - 2 - 5*f->ec;
@@ -791,7 +790,6 @@  static int read_header(FFV1Context *f)
     for (int j = 0; j < f->slice_count; j++) {
         FFV1Context *fs = f->slice_context[j];
         FFV1SliceContext *sc = &f->slices[j];
-        fs->ac            = f->ac;
         fs->packed_at_lsb = f->packed_at_lsb;
 
         fs->slice_damaged = 0;
diff --git a/libavcodec/ffv1dec_template.c b/libavcodec/ffv1dec_template.c
index 776dc4144f..30a13e0faf 100644
--- a/libavcodec/ffv1dec_template.c
+++ b/libavcodec/ffv1dec_template.c
@@ -35,7 +35,7 @@  RENAME(decode_line)(FFV1Context *f,
     int run_mode  = 0;
     int run_index = sc->run_index;
 
-    if (is_input_end(s, gb))
+    if (is_input_end(c, gb, f->ac))
         return AVERROR_INVALIDDATA;
 
     if (sc->slice_coding_mode == 1) {
@@ -55,7 +55,7 @@  RENAME(decode_line)(FFV1Context *f,
         int diff, context, sign;
 
         if (!(x & 1023)) {
-            if (is_input_end(s, gb))
+            if (is_input_end(c, gb, f->ac))
                 return AVERROR_INVALIDDATA;
         }
 
@@ -69,7 +69,7 @@  RENAME(decode_line)(FFV1Context *f,
 
         av_assert2(context < p->context_count);
 
-        if (s->ac != AC_GOLOMB_RICE) {
+        if (f->ac != AC_GOLOMB_RICE) {
             diff = get_symbol_inline(c, p->state[context], 1);
         } else {
             if (context == 0 && run_mode == 0)
diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c
index fb373b598b..7fb5b997cc 100644
--- a/libavcodec/ffv1enc.c
+++ b/libavcodec/ffv1enc.c
@@ -1053,7 +1053,7 @@  retry:
     if (f->version > 2) {
         encode_slice_header(f, fs, sc);
     }
-    if (fs->ac == AC_GOLOMB_RICE) {
+    if (f->ac == AC_GOLOMB_RICE) {
         fs->ac_byte_count = f->version > 2 || (!x && !y) ? ff_rac_terminate(&fs->c, f->version > 2) : 0;
         init_put_bits(&sc->pb,
                       fs->c.bytestream_start + fs->ac_byte_count,
@@ -1085,7 +1085,7 @@  retry:
 
     if (ret < 0) {
         av_assert0(sc->slice_coding_mode == 0);
-        if (fs->version < 4 || !fs->ac) {
+        if (fs->version < 4 || !f->ac) {
             av_log(c, AV_LOG_ERROR, "Buffer too small\n");
             return ret;
         }
@@ -1210,7 +1210,7 @@  static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
         FFV1SliceContext *sc = &f->slices[i];
         int bytes;
 
-        if (fs->ac != AC_GOLOMB_RICE) {
+        if (f->ac != AC_GOLOMB_RICE) {
             bytes = ff_rac_terminate(&fs->c, 1);
         } else {
             flush_put_bits(&sc->pb); // FIXME: nicer padding
diff --git a/libavcodec/ffv1enc_template.c b/libavcodec/ffv1enc_template.c
index 29b50637f4..970c185e93 100644
--- a/libavcodec/ffv1enc_template.c
+++ b/libavcodec/ffv1enc_template.c
@@ -34,7 +34,7 @@  RENAME(encode_line)(FFV1Context *f,
     int run_count = 0;
     int run_mode  = 0;
 
-    if (s->ac != AC_GOLOMB_RICE) {
+    if (f->ac != AC_GOLOMB_RICE) {
         if (c->bytestream_end - c->bytestream < w * 35) {
             av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
             return AVERROR_INVALIDDATA;
@@ -72,7 +72,7 @@  RENAME(encode_line)(FFV1Context *f,
 
         diff = fold(diff, bits);
 
-        if (s->ac != AC_GOLOMB_RICE) {
+        if (f->ac != AC_GOLOMB_RICE) {
             if (s->flags & AV_CODEC_FLAG_PASS1) {
                 put_symbol_inline(c, p->state[context], diff, 1, s->rc_stat,
                                   s->rc_stat2[p->quant_table_index][context]);