aom_dsp/vmaf: Fix shadowing declaration
Example warning:
```c
aom_dsp/vmaf.c: In function 'aom_calc_vmaf_multi_frame':
aom_dsp/vmaf.c:120:11: warning: declaration of 'read_frame' shadows a global declaration [-Wshadow]
120 | int (*read_frame)(float *ref_data, float *main_data, float *temp_data,
| ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
121 | int stride_byte, void *user_data),
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
aom_dsp/vmaf.c:37:12: note: shadowed declaration is here
37 | static int read_frame(float *ref_data, float *main_data, float *temp_data,
| ^~~~~~~~~~
```
Change-Id: I9b0f90ca6caeac499636576f77225a4be77c4d16
diff --git a/aom_dsp/vmaf.c b/aom_dsp/vmaf.c
index 6372475..12797a6 100644
--- a/aom_dsp/vmaf.c
+++ b/aom_dsp/vmaf.c
@@ -115,17 +115,18 @@
*vmaf = vmaf_score;
}
-void aom_calc_vmaf_multi_frame(
- void *user_data, const char *model_path,
- int (*read_frame)(float *ref_data, float *main_data, float *temp_data,
- int stride_byte, void *user_data),
- int frame_width, int frame_height, int bit_depth, double *vmaf) {
+void aom_calc_vmaf_multi_frame(void *user_data, const char *model_path,
+ int (*rd_frm)(float *ref_data, float *main_data,
+ float *temp_data, int stride_byte,
+ void *user_data),
+ int frame_width, int frame_height, int bit_depth,
+ double *vmaf) {
aom_clear_system_state();
char *fmt = bit_depth == 10 ? "yuv420p10le" : "yuv420p";
double vmaf_score;
const int ret = compute_vmaf(
- &vmaf_score, fmt, frame_width, frame_height, read_frame,
+ &vmaf_score, fmt, frame_width, frame_height, rd_frm,
/*user_data=*/user_data, (char *)model_path,
/*log_path=*/"vmaf_scores.xml", /*log_fmt=*/NULL, /*disable_clip=*/0,
/*disable_avx=*/0, /*enable_transform=*/0,
