Silence compiler warnings for XL decoder

[ffmpeg] / libavcodec / cavs.h

diff --git a/libavcodec/cavs.h b/libavcodec/cavs.h
index b2094d44e432fe47c5cfbfd240f92f7a4c8e35ab..885a2cda9e6e00be2fe3fc2f3fdc5150131e4dce 100644 (file)
--- a/libavcodec/cavs.h
+++ b/libavcodec/cavs.h
@@ -19,8 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef CAVS_H
-#define CAVS_H
+#ifndef AVCODEC_CAVS_H
+#define AVCODEC_CAVS_H
 
 #include "dsputil.h"
 #include "mpegvideo.h"
@@ -55,7 +55,7 @@
 #define MV_BWD_OFFS                     12
 #define MV_STRIDE                        4
 
-enum mb_t {
+enum cavs_mb {
   I_8X8 = 0,
   P_SKIP,
   P_16X16,
@@ -70,14 +70,14 @@ enum mb_t {
   B_8X8 = 29
 };
 
-enum sub_mb_t {
+enum cavs_sub_mb {
   B_SUB_DIRECT,
   B_SUB_FWD,
   B_SUB_BWD,
   B_SUB_SYM
 };
 
-enum intra_luma_t {
+enum cavs_intra_luma {
   INTRA_L_VERT,
   INTRA_L_HORIZ,
   INTRA_L_LP,
@@ -88,7 +88,7 @@ enum intra_luma_t {
   INTRA_L_DC_128
 };
 
-enum intra_chroma_t {
+enum cavs_intra_chroma {
   INTRA_C_LP,
   INTRA_C_HORIZ,
   INTRA_C_VERT,
@@ -98,7 +98,7 @@ enum intra_chroma_t {
   INTRA_C_DC_128,
 };
 
-enum mv_pred_t {
+enum cavs_mv_pred {
   MV_PRED_MEDIAN,
   MV_PRED_LEFT,
   MV_PRED_TOP,
@@ -107,14 +107,14 @@ enum mv_pred_t {
   MV_PRED_BSKIP
 };
 
-enum block_t {
+enum cavs_block {
   BLK_16X16,
   BLK_16X8,
   BLK_8X16,
   BLK_8X8
 };
 
-enum mv_loc_t {
+enum cavs_mv_loc {
   MV_FWD_D3 = 0,
   MV_FWD_B2,
   MV_FWD_B3,
@@ -142,15 +142,15 @@ DECLARE_ALIGNED_8(typedef, struct) {
     int16_t y;
     int16_t dist;
     int16_t ref;
-} vector_t;
+} cavs_vector;
 
-typedef struct dec_2dvlc_t {
+struct dec_2dvlc {
   int8_t rltab[59][3];
   int8_t level_add[27];
   int8_t golomb_order;
   int inc_limit;
   int8_t max_run;
-} dec_2dvlc_t;
+};
 
 typedef struct {
     MpegEncContext s;
@@ -186,9 +186,9 @@ typedef struct {
        D is the macroblock to the top-left (0)
 
        the same is repeated for backward motion vectors */
-    vector_t mv[2*4*3];
-    vector_t *top_mv[2];
-    vector_t *col_mv;
+    cavs_vector mv[2*4*3];
+    cavs_vector *top_mv[2];
+    cavs_vector *col_mv;
 
     /** luma pred mode cache
        0:    --  B2  B3
@@ -226,9 +226,9 @@ typedef struct {
 
 extern const uint8_t     ff_cavs_dequant_shift[64];
 extern const uint16_t    ff_cavs_dequant_mul[64];
-extern const dec_2dvlc_t ff_cavs_intra_dec[7];
-extern const dec_2dvlc_t ff_cavs_inter_dec[7];
-extern const dec_2dvlc_t ff_cavs_chroma_dec[5];
+extern const struct dec_2dvlc ff_cavs_intra_dec[7];
+extern const struct dec_2dvlc ff_cavs_inter_dec[7];
+extern const struct dec_2dvlc ff_cavs_chroma_dec[5];
 extern const uint8_t     ff_cavs_chroma_qp[64];
 extern const uint8_t     ff_cavs_scan3x3[4];
 extern const uint8_t     ff_cavs_partition_flags[30];
@@ -236,9 +236,9 @@ extern const int_fast8_t ff_left_modifier_l[8];
 extern const int_fast8_t ff_top_modifier_l[8];
 extern const int_fast8_t ff_left_modifier_c[7];
 extern const int_fast8_t ff_top_modifier_c[7];
-extern const vector_t ff_cavs_intra_mv;
-extern const vector_t ff_cavs_un_mv;
-extern const vector_t ff_cavs_dir_mv;
+extern const cavs_vector ff_cavs_intra_mv;
+extern const cavs_vector ff_cavs_un_mv;
+extern const cavs_vector ff_cavs_dir_mv;
 
 static inline void modify_pred(const int_fast8_t *mod_table, int *mode) {
     *mode = mod_table[*mode];
@@ -253,7 +253,7 @@ static inline void set_intra_mode_default(AVSContext *h) {
     h->top_pred_Y[h->mbx*2+0] = h->top_pred_Y[h->mbx*2+1] = INTRA_L_LP;
 }
 
-static inline void set_mvs(vector_t *mv, enum block_t size) {
+static inline void set_mvs(cavs_vector *mv, enum cavs_block size) {
     switch(size) {
     case BLK_16X16:
         mv[MV_STRIDE  ] = mv[0];
@@ -296,14 +296,14 @@ static inline int dequant(AVSContext *h, DCTELEM *level_buf, uint8_t *run_buf,
     return 0;
 }
 
-void ff_cavs_filter(AVSContext *h, enum mb_t mb_type);
+void ff_cavs_filter(AVSContext *h, enum cavs_mb mb_type);
 void ff_cavs_load_intra_pred_luma(AVSContext *h, uint8_t *top, uint8_t **left,
                                   int block);
 void ff_cavs_load_intra_pred_chroma(AVSContext *h);
 void ff_cavs_modify_mb_i(AVSContext *h, int *pred_mode_uv);
-void ff_cavs_inter(AVSContext *h, enum mb_t mb_type);
-void ff_cavs_mv(AVSContext *h, enum mv_loc_t nP, enum mv_loc_t nC,
-                enum mv_pred_t mode, enum block_t size, int ref);
+void ff_cavs_inter(AVSContext *h, enum cavs_mb mb_type);
+void ff_cavs_mv(AVSContext *h, enum cavs_mv_loc nP, enum cavs_mv_loc nC,
+                enum cavs_mv_pred mode, enum cavs_block size, int ref);
 void ff_cavs_init_mb(AVSContext *h);
 int  ff_cavs_next_mb(AVSContext *h);
 void ff_cavs_init_pic(AVSContext *h);
@@ -311,4 +311,4 @@ void ff_cavs_init_top_lines(AVSContext *h);
 int ff_cavs_init(AVCodecContext *avctx);
 int ff_cavs_end (AVCodecContext *avctx);
 
-#endif /* CAVS_H */
+#endif /* AVCODEC_CAVS_H */