commit 754f6461f31bc9a59195891f601bcb25a4b57772
author Yaowu Xu <yaowu@google.com> Mon Jul 12 14:00:23 2021 -0700
committer Yaowu Xu <yaowu@google.com> Mon Jul 12 22:58:12 2021 +0000
tree 9b17ebefe4b82f95454a759560bc649dbbcc6784
parent 11de58a279801bd32cc4e24fbcf024a24310a0d8

Rename av1_check_grain_params_equiv()

To aom_check_grain_params_equiv() since this is a function defined in
./aom_dsp.

BUG=aomedia:2734

Change-Id: I3bb9da186be005c1eb42b44846478dc3de646b40

aom_dsp/grain_synthesis.h

diff --git a/aom_dsp/grain_synthesis.h b/aom_dsp/grain_synthesis.h
index 9a8994d..62f44f5 100644
--- a/aom_dsp/grain_synthesis.h
+++ b/aom_dsp/grain_synthesis.h
@@ -31,7 +31,7 @@
  */
 typedef struct {
   // This structure is compared element-by-element in the function
-  // av1_check_grain_params_equiv: this function must be updated if any changes
+  // aom_check_grain_params_equiv: this function must be updated if any changes
   // are made to this structure.
   int apply_grain;
 
@@ -85,7 +85,7 @@
 
   uint16_t random_seed;
   // This structure is compared element-by-element in the function
-  // av1_check_grain_params_equiv: this function must be updated if any changes
+  // aom_check_grain_params_equiv: this function must be updated if any changes
   // are made to this structure.
 } aom_film_grain_t;
 
@@ -98,7 +98,7 @@
  * \param[in]    pb               The second set of parameters to compare
  * \return       Returns 1 if the params are equivalent, 0 otherwise
  */
-static INLINE int av1_check_grain_params_equiv(
+static INLINE int aom_check_grain_params_equiv(
     const aom_film_grain_t *const pa, const aom_film_grain_t *const pb) {
   if (pa->apply_grain != pb->apply_grain) return 0;
   // Don't compare update_parameters

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 5d630ce..2dca98f 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2498,7 +2498,7 @@
       assert(ref_idx != INVALID_IDX);
       const RefCntBuffer *const buf = cm->ref_frame_map[ref_idx];
       if (buf->film_grain_params_present &&
-          av1_check_grain_params_equiv(pars, &buf->film_grain_params)) {
+          aom_check_grain_params_equiv(pars, &buf->film_grain_params)) {
         break;
       }
     }