Commit d8ebb615 authored by Anton Khirnov's avatar Anton Khirnov

hevcdsp: fix a function name

put_weighted_pred_avg should be put_unweighted_pred_avg, there is no
weighting there.
parent a1926a29
...@@ -1806,8 +1806,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, ...@@ -1806,8 +1806,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0,
dst0, s->frame->linesize[0], dst0, s->frame->linesize[0],
tmp, tmp2, tmpstride, nPbW, nPbH); tmp, tmp2, tmpstride, nPbW, nPbH);
} else { } else {
s->hevcdsp.put_weighted_pred_avg(dst0, s->frame->linesize[0], s->hevcdsp.put_unweighted_pred_avg(dst0, s->frame->linesize[0],
tmp, tmp2, tmpstride, nPbW, nPbH); tmp, tmp2, tmpstride, nPbW, nPbH);
} }
chroma_mc(s, tmp, tmp2, tmpstride, ref0->frame, chroma_mc(s, tmp, tmp2, tmpstride, ref0->frame,
...@@ -1832,8 +1832,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0, ...@@ -1832,8 +1832,8 @@ static void hls_prediction_unit(HEVCContext *s, int x0, int y0,
dst2, s->frame->linesize[2], tmp2, tmp4, dst2, s->frame->linesize[2], tmp2, tmp4,
tmpstride, nPbW / 2, nPbH / 2); tmpstride, nPbW / 2, nPbH / 2);
} else { } else {
s->hevcdsp.put_weighted_pred_avg(dst1, s->frame->linesize[1], tmp, tmp3, 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_weighted_pred_avg(dst2, s->frame->linesize[2], tmp2, tmp4, tmpstride, nPbW/2, nPbH/2); s->hevcdsp.put_unweighted_pred_avg(dst2, s->frame->linesize[2], tmp2, tmp4, tmpstride, nPbW/2, nPbH/2);
} }
} }
} }
......
...@@ -162,7 +162,7 @@ void ff_hevc_dsp_init(HEVCDSPContext *hevcdsp, int bit_depth) ...@@ -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_hevc_epel[1][1] = FUNC(put_hevc_epel_hv, depth); \
\ \
hevcdsp->put_unweighted_pred = FUNC(put_unweighted_pred, 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 = FUNC(weighted_pred, depth); \
hevcdsp->weighted_pred_avg = FUNC(weighted_pred_avg, depth); \ hevcdsp->weighted_pred_avg = FUNC(weighted_pred_avg, depth); \
......
...@@ -67,9 +67,9 @@ typedef struct HEVCDSPContext { ...@@ -67,9 +67,9 @@ typedef struct HEVCDSPContext {
void (*put_unweighted_pred)(uint8_t *dst, ptrdiff_t dststride, int16_t *src, void (*put_unweighted_pred)(uint8_t *dst, ptrdiff_t dststride, int16_t *src,
ptrdiff_t srcstride, int width, int height); ptrdiff_t srcstride, int width, int height);
void (*put_weighted_pred_avg)(uint8_t *dst, ptrdiff_t dststride, void (*put_unweighted_pred_avg)(uint8_t *dst, ptrdiff_t dststride,
int16_t *src1, int16_t *src2, int16_t *src1, int16_t *src2,
ptrdiff_t srcstride, int width, int height); ptrdiff_t srcstride, int width, int height);
void (*weighted_pred)(uint8_t denom, int16_t wlxFlag, int16_t olxFlag, void (*weighted_pred)(uint8_t denom, int16_t wlxFlag, int16_t olxFlag,
uint8_t *dst, ptrdiff_t dststride, int16_t *src, uint8_t *dst, ptrdiff_t dststride, int16_t *src,
ptrdiff_t srcstride, int width, int height); ptrdiff_t srcstride, int width, int height);
......
...@@ -1033,10 +1033,10 @@ static void FUNC(put_unweighted_pred)(uint8_t *_dst, ptrdiff_t _dststride, ...@@ -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, static void FUNC(put_unweighted_pred_avg)(uint8_t *_dst, ptrdiff_t _dststride,
int16_t *src1, int16_t *src2, int16_t *src1, int16_t *src2,
ptrdiff_t srcstride, ptrdiff_t srcstride,
int width, int height) int width, int height)
{ {
int x, y; int x, y;
pixel *dst = (pixel *)_dst; pixel *dst = (pixel *)_dst;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment