Replace MAX_REF_LF_DELTAS with MAX_REF_FRAMES

The macro MAX_REF_LF_DELTAS is repeatedly defined. Merge its use
cases with MAX_REF_FRAMES.

Change-Id: I71c4634fb5feae78ce6f9bf99074f45ed7f68b73

diff --git a/vp10/common/loopfilter.h b/vp10/common/loopfilter.h
index cfeb9b8367f1b560881f7fad541e22ba0b33926e..329ab75afee4e1c0d23f817a6eb04bcecaee6286 100644 (file)
--- a/vp10/common/loopfilter.h
+++ b/vp10/common/loopfilter.h
@@ -26,7 +26,6 @@ extern "C" {
 
 #define SIMD_WIDTH 16
 
-#define MAX_REF_LF_DELTAS       4
 #define MAX_MODE_LF_DELTAS      2
 
 enum lf_path {
@@ -45,8 +44,8 @@ struct loopfilter {
   uint8_t mode_ref_delta_update;
 
   // 0 = Intra, Last, GF, ARF
-  signed char ref_deltas[MAX_REF_LF_DELTAS];
-  signed char last_ref_deltas[MAX_REF_LF_DELTAS];
+  signed char ref_deltas[MAX_REF_FRAMES];
+  signed char last_ref_deltas[MAX_REF_FRAMES];
 
   // 0 = ZERO_MV, MV
   signed char mode_deltas[MAX_MODE_LF_DELTAS];

diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index 67f6909e49e48c5a43d0019b89cb2f017f13ce92..942a07a1100feb9d614aa2c7830e3835d00696ea 100644 (file)
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -1112,7 +1112,7 @@ static void setup_loopfilter(struct loopfilter *lf,
     if (lf->mode_ref_delta_update) {
       int i;
 
-      for (i = 0; i < MAX_REF_LF_DELTAS; i++)
+      for (i = 0; i < MAX_REF_FRAMES; i++)
         if (vpx_rb_read_bit(rb))
           lf->ref_deltas[i] = vpx_rb_read_signed_literal(rb, 6);
 

diff --git a/vp10/decoder/dthread.c b/vp10/decoder/dthread.c
index 77f1cf127075285f6e13693d30540e8a49981d69..4206adcb614f9977df64d2d6c7b291e704eaa813 100644 (file)
--- a/vp10/decoder/dthread.c
+++ b/vp10/decoder/dthread.c
@@ -177,7 +177,7 @@ void vp10_frameworker_copy_context(VPxWorker *const dst_worker,
          (MAX_LOOP_FILTER + 1) * sizeof(loop_filter_thresh));
   dst_cm->lf.last_sharpness_level = src_cm->lf.sharpness_level;
   dst_cm->lf.filter_level = src_cm->lf.filter_level;
-  memcpy(dst_cm->lf.ref_deltas, src_cm->lf.ref_deltas, MAX_REF_LF_DELTAS);
+  memcpy(dst_cm->lf.ref_deltas, src_cm->lf.ref_deltas, MAX_REF_FRAMES);
   memcpy(dst_cm->lf.mode_deltas, src_cm->lf.mode_deltas, MAX_MODE_LF_DELTAS);
   dst_cm->seg = src_cm->seg;
   memcpy(dst_cm->frame_contexts, src_cm->frame_contexts,

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index a793a3b6aa8557c2c7c79cbfbf040423a65de65b..b872b4e7d2ee7d7e8e99b0510c69dc0a81051a4e 100644 (file)
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -707,7 +707,7 @@ static void encode_loopfilter(struct loopfilter *lf,
   if (lf->mode_ref_delta_enabled) {
     vpx_wb_write_bit(wb, lf->mode_ref_delta_update);
     if (lf->mode_ref_delta_update) {
-      for (i = 0; i < MAX_REF_LF_DELTAS; i++) {
+      for (i = 0; i < MAX_REF_FRAMES; i++) {
         const int delta = lf->ref_deltas[i];
         const int changed = delta != lf->last_ref_deltas[i];
         vpx_wb_write_bit(wb, changed);

diff --git a/vp10/encoder/encoder.h b/vp10/encoder/encoder.h
index 92faa0b50cd802a9811b487a4b8218dbf3ae2595..efb80ecfd4a2293a0591c4a75cb7c4eeacca5419 100644 (file)
--- a/vp10/encoder/encoder.h
+++ b/vp10/encoder/encoder.h
@@ -61,7 +61,7 @@ typedef struct {
   unsigned char *last_frame_seg_map_copy;
 
   // 0 = Intra, Last, GF, ARF
-  signed char last_ref_lf_deltas[MAX_REF_LF_DELTAS];
+  signed char last_ref_lf_deltas[MAX_REF_FRAMES];
   // 0 = ZERO_MV, MV
   signed char last_mode_lf_deltas[MAX_MODE_LF_DELTAS];