generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "palette: Add missing consts" into nextgen

Browse Source
This commit is contained in:
Alex Converse
2015-04-28 19:51:16 +00:00
committed by Gerrit Code Review
parent cb437f800f 7ae0b65f32
commit 8d9c600d44
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
vp9/common/vp9_palette.c
View File

@@ -60,10 +60,10 @@ int vp9_count_colors(const uint8_t *src, int stride, int rows, int cols) {
}
void vp9_palette_color_insertion(uint8_t *old_colors, int *m, int *count,
MB_MODE_INFO *mbmi) {
const MB_MODE_INFO *mbmi) {
int k = *m, n = mbmi->palette_literal_size;
int i, j, l, min_idx = -1;
uint8_t *new_colors = mbmi->palette_literal_colors;
const uint8_t *new_colors = mbmi->palette_literal_colors;
uint8_t val;
if (mbmi->palette_indexed_size > 0) {
@@ -141,7 +141,7 @@ int vp9_ceil_log2(int n) {
return i;
}
static double calc_dist(double *p1, double *p2, int dim) {
static double calc_dist(const double *p1, const double *p2, int dim) {
double dist = 0;
int i = 0;
@@ -151,7 +151,7 @@ static double calc_dist(double *p1, double *p2, int dim) {
return dist;
}
void vp9_calc_indices(double *data, double *centroids, int *indices,
void vp9_calc_indices(const double *data, const double *centroids, int *indices,
int n, int k, int dim) {
int i, j;
double min_dist, this_dist;
@@ -169,8 +169,8 @@ void vp9_calc_indices(double *data, double *centroids, int *indices,
}
}
static void calc_centroids(double *data, double *centroids, int *indices,
int n, int k, int dim) {
static void calc_centroids(const double *data, double *centroids,
const int *indices, int n, int k, int dim) {
int i, j, index;
int count[256];
unsigned int seed = time(NULL);
@@ -195,8 +195,8 @@ static void calc_centroids(double *data, double *centroids, int *indices,
}
}
double calc_total_dist(double *data, double *centroids, int *indices,
int n, int k, int dim) {
double calc_total_dist(const double *data, const double *centroids,
const int *indices, int n, int k, int dim) {
double dist = 0;
int i;
(void) k;
@@ -208,7 +208,7 @@ double calc_total_dist(double *data, double *centroids, int *indices,
return dist;
}
int vp9_k_means(double *data, double *centroids, int *indices,
int vp9_k_means(const double *data, double *centroids, int *indices,
int n, int k, int dim, int max_itr) {
int i = 0;
int *pre_indices;
@@ -243,7 +243,7 @@ int vp9_k_means(double *data, double *centroids, int *indices,
return i;
}
void vp9_update_palette_counts(FRAME_COUNTS *counts, MB_MODE_INFO *mbmi,
void vp9_update_palette_counts(FRAME_COUNTS *counts, const MB_MODE_INFO *mbmi,
BLOCK_SIZE bsize, int palette_ctx) {
int idx = bsize - BLOCK_8X8;
@@ -267,7 +267,7 @@ static const int palette_color_context_lookup[PALETTE_COLOR_CONTEXTS] = {
// (8, 2, 0, 0), (10, 0, 0, 0)
};
int vp9_get_palette_color_context(uint8_t *color_map, int cols,
int vp9_get_palette_color_context(const uint8_t *color_map, int cols,
int r, int c, int n, int *color_order) {
int i, j, max, max_idx, temp;
int scores[PALETTE_MAX_SIZE];

10
vp9/common/vp9_palette.h
View File

@@ -18,16 +18,16 @@
int vp9_count_colors(const uint8_t *src, int stride, int rows, int cols);
void vp9_insertion_sort(double *data, int n);
void vp9_palette_color_insertion(uint8_t *old_colors, int *m, int *count,
MB_MODE_INFO *mbmi);
const MB_MODE_INFO *mbmi);
int vp9_palette_color_lookup(uint8_t *dic, int n, uint8_t val, int bits);
int vp9_ceil_log2(int n);
int vp9_k_means(double *data, double *centroids, int *indices,
int vp9_k_means(const double *data, double *centroids, int *indices,
int n, int k, int dim, int max_itr);
void vp9_calc_indices(double *data, double *centroids, int *indices,
void vp9_calc_indices(const double *data, const double *centroids, int *indices,
int n, int k, int dim);
void vp9_update_palette_counts(FRAME_COUNTS *counts, MB_MODE_INFO *mbmi,
void vp9_update_palette_counts(FRAME_COUNTS *counts, const MB_MODE_INFO *mbmi,
BLOCK_SIZE bsize, int palette_ctx);
int vp9_get_palette_color_context(uint8_t *color_map, int cols,
int vp9_get_palette_color_context(const uint8_t *color_map, int cols,
int r, int c, int n, int *color_order);
#endif

6
vp9/encoder/vp9_rdopt.c
View File

@@ -5350,9 +5350,9 @@ static void rd_pick_palette_444(VP9_COMP *cpi, MACROBLOCK *x, RD_COST *rd_cost,
int rate_y, rate_uv, rate_y_tokenonly, rate_uv_tokenonly, y_skip, uv_skip;
int64_t dist_y, dist_uv;
uint8_t *src_y = x->plane[0].src.buf;
uint8_t *src_u = x->plane[1].src.buf;
uint8_t *src_v = x->plane[2].src.buf;
const uint8_t *src_y = x->plane[0].src.buf;
const uint8_t *src_u = x->plane[1].src.buf;
const uint8_t *src_v = x->plane[2].src.buf;
uint8_t palette_color_map_copy[4096];
int rows = 4 * num_4x4_blocks_high_lookup[bsize];
int cols = 4 * num_4x4_blocks_wide_lookup[bsize];