CodingUnit: misc, remove unsed bdpcm_dir

ffvvc · Jan 22, 2023 · b4e85c1 · b4e85c1
1 parent 94461dc
commit b4e85c1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/libavcodec/vvc_ctu.c b/libavcodec/vvc_ctu.c
@@ -662,8 +662,6 @@ static enum IntraPredMode luma_intra_pred_mode(VVCLocalContext* lc, const int in
 
     if (!intra_luma_not_planar_flag) {
         pred = INTRA_PLANAR;
-    } else if (cu->bdpcm_flag[0]) {
-        pred = cu->bdpcm_dir[0] ? INTRA_VERT : INTRA_HORZ;
     } else {
         const VVCSPS *sps       = fc->ps.sps;
         const int x_a           = (x0 - 1) >> sps->min_cb_log2_size_y;
@@ -891,10 +889,6 @@ static void derive_chroma_intra_pred_mode(VVCLocalContext *lc,
         cu->intra_pred_mode_c = luma_intra_pred_mode;
         return;
     }
-    if (cu->bdpcm_flag[1]){
-        cu->intra_pred_mode_c = cu->bdpcm_dir[1] ? INTRA_VERT : INTRA_HORZ;
-        return;
-    }
     if (cclm_mode_flag) {
         cu->intra_pred_mode_c = INTRA_LT_CCLM + cclm_mode_idx;
     } else if (intra_chroma_pred_mode == 4){

diff --git a/libavcodec/vvc_ctu.h b/libavcodec/vvc_ctu.h
@@ -228,8 +228,7 @@ typedef struct CodingUnit {
     IntraPredMode intra_pred_mode_c;        ///< IntraPredModeC
     int mip_chroma_direct_flag;             ///< MipChromaDirectFlag
 
-    int bdpcm_flag[3];                      ///< BdpcmFlag
-    int bdpcm_dir[3];                       ///< BdpcmDir
+    int bdpcm_flag[VVC_MAX_SAMPLE_ARRAYS];  ///< BdpcmFlag
 
     int apply_lfnst_flag[VVC_MAX_SAMPLE_ARRAYS];    ///< ApplyLfnstFlag[]