diff options
| -rw-r--r-- | libavcodec/hevc.c | 8 | ||||
| -rw-r--r-- | libavcodec/hevcdsp.c | 2 | ||||
| -rw-r--r-- | libavcodec/hevcdsp.h | 6 | ||||
| -rw-r--r-- | libavcodec/hevcdsp_template.c | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 6395563..f17c313 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -1806,8 +1806,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, dst0, s->frame->linesize[0], tmp, tmp2, tmpstride, nPbW, nPbH); } else { - s->hevcdsp.put_weighted_pred_avg(dst0, s->frame->linesize[0], - tmp, tmp2, tmpstride, nPbW, nPbH); + s->hevcdsp.put_unweighted_pred_avg(dst0, s->frame->linesize[0], + tmp, tmp2, tmpstride, nPbW, nPbH); } chroma_mc(s, tmp, tmp2, tmpstride, ref0->frame, @@ -1832,8 +1832,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, dst2, s->frame->linesize[2], tmp2, tmp4, tmpstride, nPbW / 2, nPbH / 2); } else { - s->hevcdsp.put_weighted_pred_avg(dst1, s->frame->linesize[1], tmp, tmp3, tmpstride, nPbW/2, nPbH/2); - s->hevcdsp.put_weighted_pred_avg(dst2, s->frame->linesize[2], tmp2, tmp4, tmpstride, nPbW/2, nPbH/2); + s->hevcdsp.put_unweighted_pred_avg(dst1, s->frame->linesize[1], tmp, tmp3, tmpstride, nPbW/2, nPbH/2); + s->hevcdsp.put_unweighted_pred_avg(dst2, s->frame->linesize[2], tmp2, tmp4, tmpstride, nPbW/2, nPbH/2); } } } diff --git a/libavcodec/hevcdsp.c b/libavcodec/hevcdsp.c index 0abee9b..216101a 100644 --- a/libavcodec/hevcdsp.c +++ b/libavcodec/hevcdsp.c @@ -162,7 +162,7 @@ void ff_hevc_dsp_init(HEVCDSPContext *hevcdsp, int bit_depth) hevcdsp->put_hevc_epel[1][1] = FUNC(put_hevc_epel_hv, depth); \ \ hevcdsp->put_unweighted_pred = FUNC(put_unweighted_pred, depth); \ - hevcdsp->put_weighted_pred_avg = FUNC(put_weighted_pred_avg, depth); \ + hevcdsp->put_unweighted_pred_avg = FUNC(put_unweighted_pred_avg, depth); \ \ hevcdsp->weighted_pred = FUNC(weighted_pred, depth); \ hevcdsp->weighted_pred_avg = FUNC(weighted_pred_avg, depth); \ diff --git a/libavcodec/hevcdsp.h b/libavcodec/hevcdsp.h index aad96db..7278464 100644 --- a/libavcodec/hevcdsp.h +++ b/libavcodec/hevcdsp.h @@ -67,9 +67,9 @@ typedef struct HEVCDSPContext { void (*put_unweighted_pred)(uint8_t *dst, ptrdiff_t dststride, int16_t *src, ptrdiff_t srcstride, int width, int height); - void (*put_weighted_pred_avg)(uint8_t *dst, ptrdiff_t dststride, - int16_t *src1, int16_t *src2, - ptrdiff_t srcstride, int width, int height); + void (*put_unweighted_pred_avg)(uint8_t *dst, ptrdiff_t dststride, + int16_t *src1, int16_t *src2, + ptrdiff_t srcstride, int width, int height); void (*weighted_pred)(uint8_t denom, int16_t wlxFlag, int16_t olxFlag, uint8_t *dst, ptrdiff_t dststride, int16_t *src, ptrdiff_t srcstride, int width, int height); diff --git a/libavcodec/hevcdsp_template.c b/libavcodec/hevcdsp_template.c index ae7e021..390f683 100644 --- a/libavcodec/hevcdsp_template.c +++ b/libavcodec/hevcdsp_template.c @@ -1033,10 +1033,10 @@ static void FUNC(put_unweighted_pred)(uint8_t *_dst, ptrdiff_t _dststride, } } -static void FUNC(put_weighted_pred_avg)(uint8_t *_dst, ptrdiff_t _dststride, - int16_t *src1, int16_t *src2, - ptrdiff_t srcstride, - int width, int height) +static void FUNC(put_unweighted_pred_avg)(uint8_t *_dst, ptrdiff_t _dststride, + int16_t *src1, int16_t *src2, + ptrdiff_t srcstride, + int width, int height) { int x, y; pixel *dst = (pixel *)_dst; |
