Commit ca081217 authored by Christophe Gisquet's avatar Christophe Gisquet Committed by Michael Niedermayer

hevcdsp: change types of SAO parameters

From openhevc
Reviewed-by: 's avatarMickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 088875b6
...@@ -31,11 +31,11 @@ typedef struct SAOParams { ...@@ -31,11 +31,11 @@ typedef struct SAOParams {
int offset_abs[3][4]; ///< sao_offset_abs int offset_abs[3][4]; ///< sao_offset_abs
int offset_sign[3][4]; ///< sao_offset_sign int offset_sign[3][4]; ///< sao_offset_sign
int band_position[3]; ///< sao_band_position uint8_t band_position[3]; ///< sao_band_position
int eo_class[3]; ///< sao_eo_class int eo_class[3]; ///< sao_eo_class
int offset_val[3][5]; ///<SaoOffsetVal int16_t offset_val[3][5]; ///<SaoOffsetVal
uint8_t type_idx[3]; ///< sao_type_idx uint8_t type_idx[3]; ///< sao_type_idx
} SAOParams; } SAOParams;
......
...@@ -338,7 +338,7 @@ static void FUNC(sao_band_filter_0)(uint8_t *_dst, uint8_t *_src, ...@@ -338,7 +338,7 @@ static void FUNC(sao_band_filter_0)(uint8_t *_dst, uint8_t *_src,
int offset_table[32] = { 0 }; int offset_table[32] = { 0 };
int k, y, x; int k, y, x;
int shift = BIT_DEPTH - 5; int shift = BIT_DEPTH - 5;
int *sao_offset_val = sao->offset_val[c_idx]; int16_t *sao_offset_val = sao->offset_val[c_idx];
int sao_left_class = sao->band_position[c_idx]; int sao_left_class = sao->band_position[c_idx];
stride_dst /= sizeof(pixel); stride_dst /= sizeof(pixel);
...@@ -368,7 +368,7 @@ static void FUNC(sao_edge_filter)(uint8_t *_dst, uint8_t *_src, ...@@ -368,7 +368,7 @@ static void FUNC(sao_edge_filter)(uint8_t *_dst, uint8_t *_src,
{ { -1, -1 }, { 1, 1 } }, // 45 degree { { -1, -1 }, { 1, 1 } }, // 45 degree
{ { 1, -1 }, { -1, 1 } }, // 135 degree { { 1, -1 }, { -1, 1 } }, // 135 degree
}; };
int *sao_offset_val = sao->offset_val[c_idx]; int16_t *sao_offset_val = sao->offset_val[c_idx];
int sao_eo_class = sao->eo_class[c_idx]; int sao_eo_class = sao->eo_class[c_idx];
pixel *dst = (pixel *)_dst; pixel *dst = (pixel *)_dst;
pixel *src = (pixel *)_src; pixel *src = (pixel *)_src;
...@@ -406,7 +406,7 @@ static void FUNC(sao_edge_filter_0)(uint8_t *_dst, uint8_t *_src, ...@@ -406,7 +406,7 @@ static void FUNC(sao_edge_filter_0)(uint8_t *_dst, uint8_t *_src,
int x, y; int x, y;
pixel *dst = (pixel *)_dst; pixel *dst = (pixel *)_dst;
pixel *src = (pixel *)_src; pixel *src = (pixel *)_src;
int *sao_offset_val = sao->offset_val[c_idx]; int16_t *sao_offset_val = sao->offset_val[c_idx];
int sao_eo_class = sao->eo_class[c_idx]; int sao_eo_class = sao->eo_class[c_idx];
int init_x = 0, init_y = 0, width = _width, height = _height; int init_x = 0, init_y = 0, width = _width, height = _height;
...@@ -459,7 +459,7 @@ static void FUNC(sao_edge_filter_1)(uint8_t *_dst, uint8_t *_src, ...@@ -459,7 +459,7 @@ static void FUNC(sao_edge_filter_1)(uint8_t *_dst, uint8_t *_src,
int x, y; int x, y;
pixel *dst = (pixel *)_dst; pixel *dst = (pixel *)_dst;
pixel *src = (pixel *)_src; pixel *src = (pixel *)_src;
int *sao_offset_val = sao->offset_val[c_idx]; int16_t *sao_offset_val = sao->offset_val[c_idx];
int sao_eo_class = sao->eo_class[c_idx]; int sao_eo_class = sao->eo_class[c_idx];
int init_x = 0, init_y = 0, width = _width, height = _height; int init_x = 0, init_y = 0, width = _width, height = _height;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment