[FFmpeg-cvslog] hevcdsp: remove compilation-time-fixed parameter from sao_edge_filter
James Almer
git at videolan.org
Thu Feb 5 19:05:42 CET 2015
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Feb 4 20:19:36 2015 -0300| [1f1c7c8a57e81803a034b00077bd43e7a6e4ed82] | committer: James Almer
hevcdsp: remove compilation-time-fixed parameter from sao_edge_filter
The stride_src parameter is always 2 * MAX_PB_SIZE + FF_INPUT_BUFFER_PADDING_SIZE.
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1f1c7c8a57e81803a034b00077bd43e7a6e4ed82
---
libavcodec/hevc_filter.c | 5 ++---
libavcodec/hevcdsp.h | 6 +++---
libavcodec/hevcdsp_template.c | 5 ++---
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/libavcodec/hevc_filter.c b/libavcodec/hevc_filter.c
index bf88b47..cea975d 100644
--- a/libavcodec/hevc_filter.c
+++ b/libavcodec/hevc_filter.c
@@ -427,9 +427,8 @@ 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->offset_val[c_idx], sao->eo_class[c_idx],
- width, height);
+ s->hevcdsp.sao_edge_filter(src, dst, stride_src, 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 1510f39..c0706fa 100644
--- a/libavcodec/hevcdsp.h
+++ b/libavcodec/hevcdsp.h
@@ -61,9 +61,9 @@ typedef struct HEVCDSPContext {
void (*sao_band_filter[5])(uint8_t *_dst, uint8_t *_src, ptrdiff_t _stride_dst, ptrdiff_t _stride_src,
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, int16_t *sao_offset_val, int sao_eo_class,
- int width, int height);
+ /* implicit stride_src parameter has value of 2 * MAX_PB_SIZE + FF_INPUT_BUFFER_PADDING_SIZE */
+ void (*sao_edge_filter)(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, 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 ac98709..9ce7bf2 100644
--- a/libavcodec/hevcdsp_template.c
+++ b/libavcodec/hevcdsp_template.c
@@ -327,8 +327,7 @@ 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, int16_t *sao_offset_val,
+static void FUNC(sao_edge_filter)(uint8_t *_dst, uint8_t *_src, ptrdiff_t stride_dst, int16_t *sao_offset_val,
int eo, int width, int height) {
static const uint8_t edge_idx[] = { 1, 2, 0, 3, 4 };
@@ -342,7 +341,7 @@ static void FUNC(sao_edge_filter)(uint8_t *_dst, uint8_t *_src,
pixel *src = (pixel *)_src;
int a_stride, b_stride;
int x, y;
- stride_src /= sizeof(pixel);
+ ptrdiff_t stride_src = (2*MAX_PB_SIZE + FF_INPUT_BUFFER_PADDING_SIZE) / sizeof(pixel);
stride_dst /= sizeof(pixel);
a_stride = pos[eo][0][0] + pos[eo][0][1] * stride_src;
More information about the ffmpeg-cvslog
mailing list