The dststride parameter is always MAX_PB_SIZE.
---
libavcodec/hevc.c | 4 ++--
libavcodec/hevcdsp.h | 4 ++--
libavcodec/hevcdsp_template.c | 27 +--
libavcodec/x86/hevc_mc.asm| 16
libavcodec/x86/hevcdsp.h | 2 +-
libavcodec/x86/hevcdsp_init.c | 16
6 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 69319e2..3901c0c 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -1381,7 +1381,7 @@ static void luma_mc_uni(HEVCContext *s, uint8_t *dst,
ptrdiff_t dststride,
src1stride = edge_emu_stride;
}
-s->hevcdsp.put_hevc_qpel[idx][!!my0][!!mx0](tmp, MAX_PB_SIZE, src0,
src0stride,
+s->hevcdsp.put_hevc_qpel[idx][!!my0][!!mx0](tmp, src0, src0stride,
block_h, mx0, my0, block_w);
if (!weight_flag)
s->hevcdsp.put_hevc_qpel_bi[idx][!!my1][!!mx1](dst, dststride, src1,
src1stride, tmp, MAX_PB_SIZE,
@@ -1553,7 +1553,7 @@ static void chroma_mc_bi(HEVCContext *s, uint8_t *dst0,
ptrdiff_t dststride, AVF
src2stride = edge_emu_stride;
}
-s->hevcdsp.put_hevc_epel[idx][!!my0][!!mx0](tmp, tmpstride, src1,
src1stride,
+s->hevcdsp.put_hevc_epel[idx][!!my0][!!mx0](tmp, src1, src1stride,
block_h, _mx0, _my0, block_w);
if (!weight_flag)
s->hevcdsp.put_hevc_epel_bi[idx][!!my1][!!mx1](dst0,
s->frame->linesize[cidx+1],
diff --git a/libavcodec/hevcdsp.h b/libavcodec/hevcdsp.h
index be0b387..122501f 100644
--- a/libavcodec/hevcdsp.h
+++ b/libavcodec/hevcdsp.h
@@ -67,7 +67,7 @@ typedef struct HEVCDSPContext {
int _height, int c_idx, uint8_t *vert_edge,
uint8_t *horiz_edge, uint8_t *diag_edge);
-void (*put_hevc_qpel[10][2][2])(int16_t *dst, ptrdiff_t dststride, uint8_t
*src, ptrdiff_t srcstride,
+void (*put_hevc_qpel[10][2][2])(int16_t *dst, uint8_t *src, ptrdiff_t
srcstride,
int height, intptr_t mx, intptr_t my, int
width);
void (*put_hevc_qpel_uni[10][2][2])(uint8_t *dst, ptrdiff_t dststride,
uint8_t *src, ptrdiff_t srcstride,
int height, intptr_t mx, intptr_t my,
int width);
@@ -81,7 +81,7 @@ typedef struct HEVCDSPContext {
int16_t *src2, ptrdiff_t src2stride,
int height, int denom, int wx0, int
wx1,
int ox0, int ox1, intptr_t mx,
intptr_t my, int width);
-void (*put_hevc_epel[10][2][2])(int16_t *dst, ptrdiff_t dststride, uint8_t
*src, ptrdiff_t srcstride,
+void (*put_hevc_epel[10][2][2])(int16_t *dst, uint8_t *src, ptrdiff_t
srcstride,
int height, intptr_t mx, intptr_t my, int
width);
void (*put_hevc_epel_uni[10][2][2])(uint8_t *dst, ptrdiff_t dststride,
uint8_t *_src, ptrdiff_t _srcstride,
diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevcdsp_template.c
index 03a1c68..df49fc6 100644
--- a/libavcodec/hevcdsp_template.c
+++ b/libavcodec/hevcdsp_template.c
@@ -543,7 +543,7 @@ static void FUNC(sao_edge_filter_1)(uint8_t *_dst, uint8_t
*_src,
//
-static void FUNC(put_hevc_pel_pixels)(int16_t *dst, ptrdiff_t dststride,
+static void FUNC(put_hevc_pel_pixels)(int16_t *dst,
uint8_t *_src, ptrdiff_t _srcstride,
int height, intptr_t mx, intptr_t my,
int width)
{
@@ -555,7 +555,7 @@ static void FUNC(put_hevc_pel_pixels)(int16_t *dst,
ptrdiff_t dststride,
for (x = 0; x < width; x++)
dst[x] = src[x] << (14 - BIT_DEPTH);
src += srcstride;
-dst += dststride;
+dst += MAX_PB_SIZE;
}
}
@@ -664,7 +664,7 @@ static void FUNC(put_hevc_pel_bi_w_pixels)(uint8_t *_dst,
ptrdiff_t _dststride,
filter[6] * src[x + 3 * stride] +
\
filter[7] * src[x + 4 * stride])
-static void FUNC(put_hevc_qpel_h)(int16_t *dst, ptrdiff_t dststride,
+static void FUNC(put_hevc_qpel_h)(int16_t *dst,
uint8_t *_src, ptrdiff_t _srcstride,
int height, intptr_t mx, intptr_t my, int
width)
{
@@ -676,11 +676,11 @@ static void FUNC(put_hevc_qpel_h)(int16_t *dst,
ptrdiff_t dststride,
for (x = 0; x < width; x++)
dst[x] = QPEL_FILTER(src, 1) >> (BIT_DEPTH - 8);
src += srcstride;
-dst += dststride;
+dst += MAX_PB_SIZE;
}
}
-static void FUNC(put_hevc_qpel_v)(int16_t *dst, ptrdiff_t dststride,
+static void FUNC(put_hevc_qpel_v)(int16_t *dst,
