Rename od_cdf_init() to aom_cdf_init(). Change-Id: I74d6cd507460d418c7be7faa31394fbcd8bb0d5d
diff --git a/av1/common/generic_code.c b/av1/common/generic_code.c index 4022cf1..c75c3da 100644 --- a/av1/common/generic_code.c +++ b/av1/common/generic_code.c
@@ -17,7 +17,7 @@ #include "generic_code.h" -void od_cdf_init(uint16_t *cdf, int ncdfs, int nsyms, int val, int first) { +void aom_cdf_init(uint16_t *cdf, int ncdfs, int nsyms, int val, int first) { int i; int j; for (i = 0; i < ncdfs; i++) {
diff --git a/av1/common/generic_code.h b/av1/common/generic_code.h index 6059190..bd06786 100644 --- a/av1/common/generic_code.h +++ b/av1/common/generic_code.h
@@ -40,19 +40,19 @@ void generic_model_init(generic_encoder *model); -#define OD_CDFS_INIT(cdf, val) od_cdf_init(&cdf[0][0],\ +#define OD_CDFS_INIT(cdf, val) aom_cdf_init(&cdf[0][0], \ sizeof(cdf)/sizeof(cdf[0]), sizeof(cdf[0])/sizeof(cdf[0][0]), val, val) -#define OD_CDFS_INIT_FIRST(cdf, val, first) od_cdf_init(&cdf[0][0],\ +#define OD_CDFS_INIT_FIRST(cdf, val, first) aom_cdf_init(&cdf[0][0], \ sizeof(cdf)/sizeof(cdf[0]), sizeof(cdf[0])/sizeof(cdf[0][0]), val, first) -#define OD_SINGLE_CDF_INIT(cdf, val) od_cdf_init(cdf,\ +#define OD_SINGLE_CDF_INIT(cdf, val) aom_cdf_init(cdf, \ 1, sizeof(cdf)/sizeof(cdf[0]), val, val) -#define OD_SINGLE_CDF_INIT_FIRST(cdf, val, first) od_cdf_init(cdf,\ +#define OD_SINGLE_CDF_INIT_FIRST(cdf, val, first) aom_cdf_init(cdf, \ 1, sizeof(cdf)/sizeof(cdf[0]), val, first) -void od_cdf_init(uint16_t *cdf, int ncdfs, int nsyms, int val, int first); +void aom_cdf_init(uint16_t *cdf, int ncdfs, int nsyms, int val, int first); void od_cdf_adapt_q15(int val, uint16_t *cdf, int n, int *count, int rate);