avcodec/vvcdec: do not zero frame msf mmi table

Nuo Mi committed 2 years ago

Commit ca2caeb1 parent 0c7106f3 files · +7 −6Browse files

Unified · Split

3 files

 static void set_cu_tabs(const VVCLocalContext *lc, const CodingUnit *cu)
 {
-    const VVCFrameContext *fc   = lc->fc;
+    const VVCFrameContext *fc = lc->fc;
-    const TransformUnit *tu     = cu->tus.head;
+    const PredictionUnit *pu  = &cu->pu;
+    const TransformUnit *tu   = cu->tus.head;
+    set_cb_tab(lc, fc->tab.mmi, pu->mi.motion_model_idc);
+    set_cb_tab(lc, fc->tab.msf, pu->merge_subblock_flag);
     if (cu->tree_type != DUAL_TREE_CHROMA)
         set_cb_tab(lc, fc->tab.skip, cu->skip_flag);
     PredictionUnit *pu          = &cu->pu;
     int merge_subblock_idx      = 0;
-    set_cb_tab(lc, fc->tab.msf, pu->merge_subblock_flag);
     if (ph->max_num_subblock_merge_cand > 1) {
         merge_subblock_idx = ff_vvc_merge_subblock_idx(lc, ph->max_num_subblock_merge_cand);
     }

     tl_init(l, 1, changed);
-    TL_ADD(msf, pic_size_in_min_pu);
     TL_ADD(iaf, pic_size_in_min_pu);
-    TL_ADD(mmi, pic_size_in_min_pu);
 }
 static void min_pu_nz_tl_init(TabList *l, VVCFrameContext *fc)
     tl_init(l, 0, changed);
+    TL_ADD(msf, pic_size_in_min_pu);
+    TL_ADD(mmi, pic_size_in_min_pu);
     TL_ADD(mvf, pic_size_in_min_pu);
 }

@@ -399,7 +399,6 @@ static void store_cp_mv(const VVCLocalContext lc, const MotionInfo mi, const i · 398 unmodified lines
399	const int offset = (y_cb * min_cb_width + x_cb) * MAX_CONTROL_POINTS;	399	const int offset = (y_cb * min_cb_width + x_cb) * MAX_CONTROL_POINTS;
400		400
401	memcpy(&fc->tab.cp_mv[lx][offset], mi->mv[lx], sizeof(Mv) * num_cp_mv);	401	memcpy(&fc->tab.cp_mv[lx][offset], mi->mv[lx], sizeof(Mv) * num_cp_mv);
402	SAMPLE_CTB(fc->tab.mmi, x_cb, y_cb) = mi->motion_model_idc;
403	}	402	}
404	}	403	}
405	}	404	}

Keyboard shortcuts