commit 60a055bd5ce1364ba132305dffd6fda75eb6730f
author David Barker <david.barker@argondesign.com> Wed Jan 18 15:10:43 2017 +0000
committer David Barker <david.barker@argondesign.com> Wed Jan 18 16:31:05 2017 +0000
tree 6bd7b7b893ec163563a4c1b5f13c3cb89017e6a2
parent 9f45bc480e244fdb869729be7b69c20f87c1f92e

Fix compile errors with loop-restoration + highbd

Change-Id: I0d9850e082b8da3b182a3bbaf6569c45317c9659

av1/common/restoration.c

diff --git a/av1/common/restoration.c b/av1/common/restoration.c
index c4997b1..c061375 100644
--- a/av1/common/restoration.c
+++ b/av1/common/restoration.c
@@ -1191,7 +1191,7 @@
                                           int32_t *dat, int dat_stride,
                                           int bd) {
   const int shift = (bd - 8);
-  int i, j, old_px;
+  int i, j, acc, old_px;
   for (j = 0; j < width; ++j) {
     // top to bottom
     acc = dat[j];

av1/encoder/pickrst.c

diff --git a/av1/encoder/pickrst.c b/av1/encoder/pickrst.c
index 8de1bd4..cb11e03 100644
--- a/av1/encoder/pickrst.c
+++ b/av1/encoder/pickrst.c
@@ -78,7 +78,8 @@
   return filt_err;
 }
 
-static int64_t sse_restoration_frame(const YV12_BUFFER_CONFIG *src,
+static int64_t sse_restoration_frame(AV1_COMMON *const cm,
+                                     const YV12_BUFFER_CONFIG *src,
                                      const YV12_BUFFER_CONFIG *dst,
                                      int components_pattern) {
   int64_t filt_err = 0;
@@ -95,6 +96,8 @@
     }
     return filt_err;
   }
+#else
+  (void)cm;
 #endif  // CONFIG_AOM_HIGHBITDEPTH
   if ((components_pattern >> AOM_PLANE_Y) & 1) {
     filt_err = aom_get_y_sse(src, dst);
@@ -154,7 +157,7 @@
   int64_t filt_err;
   av1_loop_restoration_frame(cm->frame_to_show, cm, rsi, components_pattern,
                              partial_frame, dst_frame);
-  filt_err = sse_restoration_frame(src, dst_frame, components_pattern);
+  filt_err = sse_restoration_frame(cm, src, dst_frame, components_pattern);
   return filt_err;
 }
 
@@ -987,7 +990,7 @@
   aom_yv12_copy_v(cm->frame_to_show, &cpi->last_frame_db);
 
   rsi[plane].frame_restoration_type = RESTORE_NONE;
-  err = sse_restoration_frame(src, cm->frame_to_show, (1 << plane));
+  err = sse_restoration_frame(cm, src, cm->frame_to_show, (1 << plane));
   bits = 0;
   cost_norestore_frame = RDCOST_DBL(x->rdmult, x->rddiv, (bits >> 4), err);