hevcdsp: fix a function name
authorAnton Khirnov <anton@khirnov.net>
Sun, 12 Jul 2015 05:50:28 +0000 (07:50 +0200)
committerAnton Khirnov <anton@khirnov.net>
Fri, 21 Aug 2015 06:46:05 +0000 (08:46 +0200)
put_weighted_pred_avg should be put_unweighted_pred_avg, there is no
weighting there.

libavcodec/hevc.c
libavcodec/hevcdsp.c
libavcodec/hevcdsp.h
libavcodec/hevcdsp_template.c

index 6395563..f17c313 100644 (file)
@@ -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);
         }
     }
 }
index 0abee9b..216101a 100644 (file)
@@ -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);        \
index aad96db..7278464 100644 (file)
@@ -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);
index ae7e021..390f683 100644 (file)
@@ -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;