Revert "Rename av1_add_film_grain() to aom_add_film_grain()"
This reverts commit 11de58a279801bd32cc4e24fbcf024a24310a0d8.
Reason for revert: Renamed the exported symbol 'av1_add_film_grain'
BUG=aomedia:3169
Change-Id: Ifd5d55779d3d69705835260393ff3cb18fd6a97a
diff --git a/aom_dsp/grain_synthesis.c b/aom_dsp/grain_synthesis.c
index d476aff..626eb76 100644
--- a/aom_dsp/grain_synthesis.c
+++ b/aom_dsp/grain_synthesis.c
@@ -914,7 +914,7 @@
}
}
-int aom_add_film_grain(const aom_film_grain_t *params, const aom_image_t *src,
+int av1_add_film_grain(const aom_film_grain_t *params, const aom_image_t *src,
aom_image_t *dst) {
uint8_t *luma, *cb, *cr;
int height, width, luma_stride, chroma_stride;
@@ -1015,12 +1015,12 @@
luma_stride = dst->stride[AOM_PLANE_Y] >> use_high_bit_depth;
chroma_stride = dst->stride[AOM_PLANE_U] >> use_high_bit_depth;
- return aom_add_film_grain_run(
+ return av1_add_film_grain_run(
params, luma, cb, cr, height, width, luma_stride, chroma_stride,
use_high_bit_depth, chroma_subsamp_y, chroma_subsamp_x, mc_identity);
}
-int aom_add_film_grain_run(const aom_film_grain_t *params, uint8_t *luma,
+int av1_add_film_grain_run(const aom_film_grain_t *params, uint8_t *luma,
uint8_t *cb, uint8_t *cr, int height, int width,
int luma_stride, int chroma_stride,
int use_high_bit_depth, int chroma_subsamp_y,
diff --git a/aom_dsp/grain_synthesis.h b/aom_dsp/grain_synthesis.h
index 62f44f5..7945767 100644
--- a/aom_dsp/grain_synthesis.h
+++ b/aom_dsp/grain_synthesis.h
@@ -166,7 +166,7 @@
* \param[in] luma_stride luma plane stride
* \param[in] chroma_stride chroma plane stride
*/
-int aom_add_film_grain_run(const aom_film_grain_t *grain_params, uint8_t *luma,
+int av1_add_film_grain_run(const aom_film_grain_t *grain_params, uint8_t *luma,
uint8_t *cb, uint8_t *cr, int height, int width,
int luma_stride, int chroma_stride,
int use_high_bit_depth, int chroma_subsamp_y,
@@ -182,7 +182,7 @@
* \param[in] src Source image
* \param[out] dst Resulting image with grain
*/
-int aom_add_film_grain(const aom_film_grain_t *grain_params,
+int av1_add_film_grain(const aom_film_grain_t *grain_params,
const aom_image_t *src, aom_image_t *dst);
#ifdef __cplusplus
diff --git a/av1/av1_dx_iface.c b/av1/av1_dx_iface.c
index 2708699..686db8d 100644
--- a/av1/av1_dx_iface.c
+++ b/av1/av1_dx_iface.c
@@ -717,7 +717,7 @@
grain_img->user_priv = img->user_priv;
grain_img->fb_priv = fb->priv;
- if (aom_add_film_grain(grain_params, img, grain_img)) {
+ if (av1_add_film_grain(grain_params, img, grain_img)) {
pool->release_fb_cb(pool->cb_priv, fb);
return NULL;
}
diff --git a/av1/exports_dec b/av1/exports_dec
index e9e0865..daabf67 100644
--- a/av1/exports_dec
+++ b/av1/exports_dec
@@ -1,3 +1,3 @@
data aom_codec_av1_dx_algo
text aom_codec_av1_dx
-text aom_add_film_grain
+text av1_add_film_grain
diff --git a/examples/noise_model.c b/examples/noise_model.c
index 5ff4c04..d07443f 100644
--- a/examples/noise_model.c
+++ b/examples/noise_model.c
@@ -183,8 +183,8 @@
grain->bit_depth = raw->bit_depth;
aom_img_alloc(&renoised, raw->fmt, raw->w, raw->h, 1);
- if (aom_add_film_grain(grain, denoised, &renoised)) {
- fprintf(stderr, "Internal failure in aom_add_film_grain().\n");
+ if (av1_add_film_grain(grain, denoised, &renoised)) {
+ fprintf(stderr, "Internal failure in av1_add_film_grain().\n");
aom_img_free(&renoised);
return;
}
