diff options
| author | Christophe Gisquet <christophe.gisquet@gmail.com> | 2014-07-23 13:39:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-23 20:54:03 +0200 |
| commit | ca081217cda87bf8c5a32b0584665bce9b266d95 (patch) | |
| tree | 3ef901e43da3a91d73aa9db985faf3d921127e72 | |
| parent | 088875b6b8553cfa591a5edafd3652e4bb80c695 (diff) | |
| download | ffmpeg-ca081217cda87bf8c5a32b0584665bce9b266d95.tar.gz | |
hevcdsp: change types of SAO parameters
From openhevc
Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/hevcdsp.h | 4 | ||||
| -rw-r--r-- | libavcodec/hevcdsp_template.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/hevcdsp.h b/libavcodec/hevcdsp.h index 8564deb1a0..ba42984fb6 100644 --- a/libavcodec/hevcdsp.h +++ b/libavcodec/hevcdsp.h @@ -31,11 +31,11 @@ typedef struct SAOParams { int offset_abs[3][4]; ///< sao_offset_abs 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 offset_val[3][5]; ///<SaoOffsetVal + int16_t offset_val[3][5]; ///<SaoOffsetVal uint8_t type_idx[3]; ///< sao_type_idx } SAOParams; diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevcdsp_template.c index 8ebe8d400f..03a1c6881b 100644 --- a/libavcodec/hevcdsp_template.c +++ b/libavcodec/hevcdsp_template.c @@ -338,7 +338,7 @@ static void FUNC(sao_band_filter_0)(uint8_t *_dst, uint8_t *_src, int offset_table[32] = { 0 }; int k, y, x; 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]; stride_dst /= sizeof(pixel); @@ -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 } }, // 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]; pixel *dst = (pixel *)_dst; pixel *src = (pixel *)_src; @@ -406,7 +406,7 @@ static void FUNC(sao_edge_filter_0)(uint8_t *_dst, uint8_t *_src, int x, y; pixel *dst = (pixel *)_dst; 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 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, int x, y; pixel *dst = (pixel *)_dst; 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 init_x = 0, init_y = 0, width = _width, height = _height; |