From 7457afc64d5fcaddfaf07bfd5d436ebfb3675afe Mon Sep 17 00:00:00 2001 From: James Almer Date: Tue, 3 Feb 2015 22:39:03 -0300 Subject: [PATCH] hevcdsp: replace the SAOParams struct parameter from sao_edge_filter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As with sao_band_filter, pass instead the two variables from the struct needed in the function. This simplifies writing asm optimized versions. Reviewed-by: Mickaël Raulet Signed-off-by: James Almer --- libavcodec/hevc_filter.c | 4 +++- libavcodec/hevcdsp.h | 4 ++-- libavcodec/hevcdsp_template.c | 7 ++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c index b002d87fba..bf88b47cb3 100644 --- a/libavcodec/hevc_filter.c +++ b/libavcodec/hevc_filter.c @@ -427,7 +427,9 @@ static void sao_filter_CTB(HEVCContext *s, int x, int y) copy_CTB_to_hv(s, src, stride_src, x0, y0, width, height, c_idx, x_ctb, y_ctb); - s->hevcdsp.sao_edge_filter(src, dst, stride_src, stride_dst, sao, width, height, c_idx); + s->hevcdsp.sao_edge_filter(src, dst, stride_src, stride_dst, + sao->offset_val[c_idx], sao->eo_class[c_idx], + width, height); s->hevcdsp.sao_edge_restore[restore](src, dst, stride_src, stride_dst, sao, diff --git a/libavcodec/hevcdsp.h b/libavcodec/hevcdsp.h index 53d7b1b7e7..1510f3992c 100644 --- a/libavcodec/hevcdsp.h +++ b/libavcodec/hevcdsp.h @@ -62,8 +62,8 @@ typedef struct HEVCDSPContext { int16_t *sao_offset_val, int sao_left_class, int width, int height); void (*sao_edge_filter)(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, - ptrdiff_t stride_src, SAOParams *sao, int width, - int height, int c_idx); + ptrdiff_t stride_src, int16_t *sao_offset_val, int sao_eo_class, + int width, int height); void (*sao_edge_restore[2])(uint8_t *_dst, uint8_t *_src, ptrdiff_t _stride_dst, ptrdiff_t _stride_src, struct SAOParams *sao, int *borders, int _width, int _height, int c_idx, diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevcdsp_template.c index 44794356bf..ac9870938b 100644 --- a/libavcodec/hevcdsp_template.c +++ b/libavcodec/hevcdsp_template.c @@ -328,9 +328,8 @@ static void FUNC(sao_band_filter_0)(uint8_t *_dst, uint8_t *_src, #define CMP(a, b) ((a) > (b) ? 1 : ((a) == (b) ? 0 : -1)) static void FUNC(sao_edge_filter)(uint8_t *_dst, uint8_t *_src, - ptrdiff_t stride_dst, ptrdiff_t stride_src, SAOParams *sao, - int width, int height, - int c_idx) { + ptrdiff_t stride_dst, ptrdiff_t stride_src, int16_t *sao_offset_val, + int eo, int width, int height) { static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 }; static const int8_t pos[4][2][2] = { @@ -339,8 +338,6 @@ static void FUNC(sao_edge_filter)(uint8_t *_dst, uint8_t *_src, { { -1, -1 }, { 1, 1 } }, // 45 degree { { 1, -1 }, { -1, 1 } }, // 135 degree }; - int16_t *sao_offset_val = sao->offset_val[c_idx]; - int eo = sao->eo_class[c_idx]; pixel *dst = (pixel *)_dst; pixel *src = (pixel *)_src; int a_stride, b_stride;