[FFmpeg-cvslog] avcodec/h264pred: Don't compile > 8 bit versions of VP7/8 functions

[Andreas Rheinhardt]

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon Jan 10 15:58:07 2022 +0100| [0a6e000d75b5f721002b4e0bb7b87700472e30b2] | committer: Andreas Rheinhardt

avcodec/h264pred: Don't compile > 8 bit versions of VP7/8 functions

VP7 and VP8 are eight bit only.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0a6e000d75b5f721002b4e0bb7b87700472e30b2
---

 libavcodec/h264pred.c          | 36 ++++++++++++++++++++++++++++++------
 libavcodec/h264pred_template.c | 34 ++++++----------------------------
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/libavcodec/h264pred.c b/libavcodec/h264pred.c
index bd0d4a3d06..731cf48ea6 100644
--- a/libavcodec/h264pred.c
+++ b/libavcodec/h264pred.c
@@ -53,6 +53,30 @@
 #include "h264pred_template.c"
 #undef BIT_DEPTH
 
+static void pred4x4_127_dc_c(uint8_t *src, const uint8_t *topright,
+                             ptrdiff_t _stride)
+{
+    int stride = _stride;
+    const uint32_t a = 0x7F7F7F7FU;
+
+    AV_WN32A(src + 0 * stride, a);
+    AV_WN32A(src + 1 * stride, a);
+    AV_WN32A(src + 2 * stride, a);
+    AV_WN32A(src + 3 * stride, a);
+}
+
+static void pred4x4_129_dc_c(uint8_t *src, const uint8_t *topright,
+                             ptrdiff_t _stride)
+{
+    int stride = _stride;
+    const uint32_t a = 0x81818181U;
+
+    AV_WN32A(src + 0 * stride, a);
+    AV_WN32A(src + 1 * stride, a);
+    AV_WN32A(src + 2 * stride, a);
+    AV_WN32A(src + 3 * stride, a);
+}
+
 static void pred4x4_vertical_vp8_c(uint8_t *src, const uint8_t *topright,
                                    ptrdiff_t stride)
 {
@@ -447,8 +471,8 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
             h->pred4x4[TOP_DC_PRED     ]= FUNCC(pred4x4_top_dc            , depth);\
         } else {\
             h->pred4x4[TM_VP8_PRED     ]= FUNCD(pred4x4_tm_vp8);\
-            h->pred4x4[DC_127_PRED     ]= FUNCC(pred4x4_127_dc            , depth);\
-            h->pred4x4[DC_129_PRED     ]= FUNCC(pred4x4_129_dc            , depth);\
+            h->pred4x4[DC_127_PRED     ]= FUNCD(pred4x4_127_dc);\
+            h->pred4x4[DC_129_PRED     ]= FUNCD(pred4x4_129_dc);\
             h->pred4x4[VERT_VP8_PRED   ]= FUNCC(pred4x4_vertical          , depth);\
             h->pred4x4[HOR_VP8_PRED    ]= FUNCC(pred4x4_horizontal        , depth);\
         }\
@@ -524,8 +548,8 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
         h->pred8x8[LEFT_DC_PRED8x8]= FUNCD(pred8x8_left_dc_rv40);\
         h->pred8x8[TOP_DC_PRED8x8 ]= FUNCD(pred8x8_top_dc_rv40);\
         if (codec_id == AV_CODEC_ID_VP7 || codec_id == AV_CODEC_ID_VP8) {\
-            h->pred8x8[DC_127_PRED8x8]= FUNCC(pred8x8_127_dc              , depth);\
-            h->pred8x8[DC_129_PRED8x8]= FUNCC(pred8x8_129_dc              , depth);\
+            h->pred8x8[DC_127_PRED8x8]= FUNCC(pred8x8_127_dc, 8);\
+            h->pred8x8[DC_129_PRED8x8]= FUNCC(pred8x8_129_dc, 8);\
         }\
     }\
     if (chroma_format_idc <= 1) {\
@@ -547,8 +571,8 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
     case AV_CODEC_ID_VP7:\
     case AV_CODEC_ID_VP8:\
        h->pred16x16[PLANE_PRED8x8  ]= FUNCD(pred16x16_tm_vp8);\
-       h->pred16x16[DC_127_PRED8x8]= FUNCC(pred16x16_127_dc               , depth);\
-       h->pred16x16[DC_129_PRED8x8]= FUNCC(pred16x16_129_dc               , depth);\
+       h->pred16x16[DC_127_PRED8x8]= FUNCC(pred16x16_127_dc, 8);\
+       h->pred16x16[DC_129_PRED8x8]= FUNCC(pred16x16_129_dc, 8);\
        break;\
     default:\
        h->pred16x16[PLANE_PRED8x8  ]= FUNCC(pred16x16_plane               , depth);\
diff --git a/libavcodec/h264pred_template.c b/libavcodec/h264pred_template.c
index 2b30fff70f..b5bc942a5e 100644
--- a/libavcodec/h264pred_template.c
+++ b/libavcodec/h264pred_template.c
@@ -111,32 +111,6 @@ static void FUNCC(pred4x4_128_dc)(uint8_t *_src, const uint8_t *topright,
     AV_WN4PA(src+3*stride, a);
 }
 
-static void FUNCC(pred4x4_127_dc)(uint8_t *_src, const uint8_t *topright,
-                                  ptrdiff_t _stride)
-{
-    pixel *src = (pixel*)_src;
-    int stride = _stride>>(sizeof(pixel)-1);
-    const pixel4 a = PIXEL_SPLAT_X4((1<<(BIT_DEPTH-1))-1);
-
-    AV_WN4PA(src+0*stride, a);
-    AV_WN4PA(src+1*stride, a);
-    AV_WN4PA(src+2*stride, a);
-    AV_WN4PA(src+3*stride, a);
-}
-
-static void FUNCC(pred4x4_129_dc)(uint8_t *_src, const uint8_t *topright,
-                                  ptrdiff_t _stride)
-{
-    pixel *src = (pixel*)_src;
-    int stride = _stride>>(sizeof(pixel)-1);
-    const pixel4 a = PIXEL_SPLAT_X4((1<<(BIT_DEPTH-1))+1);
-
-    AV_WN4PA(src+0*stride, a);
-    AV_WN4PA(src+1*stride, a);
-    AV_WN4PA(src+2*stride, a);
-    AV_WN4PA(src+3*stride, a);
-}
-
 
 #define LOAD_TOP_RIGHT_EDGE\
     const unsigned av_unused t4 = topright[0];\
@@ -427,9 +401,11 @@ static void FUNCC(pred16x16_##n##_dc)(uint8_t *_src, ptrdiff_t stride)\
     PREDICT_16x16_DC(PIXEL_SPLAT_X4(v));\
 }
 
-PRED16x16_X(127, (1<<(BIT_DEPTH-1))-1)
 PRED16x16_X(128, (1<<(BIT_DEPTH-1))+0)
+#if BIT_DEPTH == 8
+PRED16x16_X(127, (1<<(BIT_DEPTH-1))-1)
 PRED16x16_X(129, (1<<(BIT_DEPTH-1))+1)
+#endif
 
 static inline void FUNCC(pred16x16_plane_compat)(uint8_t *_src,
                                                  ptrdiff_t _stride,
@@ -551,9 +527,11 @@ static void FUNCC(pred8x8_##n##_dc)(uint8_t *_src, ptrdiff_t stride)\
     }\
 }
 
-PRED8x8_X(127, (1<<(BIT_DEPTH-1))-1)
 PRED8x8_X(128, (1<<(BIT_DEPTH-1))+0)
+#if BIT_DEPTH == 8
+PRED8x8_X(127, (1<<(BIT_DEPTH-1))-1)
 PRED8x8_X(129, (1<<(BIT_DEPTH-1))+1)
+#endif
 
 static void FUNCC(pred8x16_128_dc)(uint8_t *_src, ptrdiff_t stride)
 {