diff --git a/av2/common/av2_common_int.h b/av2/common/av2_common_int.h index e90a00f57b..941dd3c511 100644 --- a/av2/common/av2_common_int.h +++ b/av2/common/av2_common_int.h @@ -979,9 +979,6 @@ typedef struct OperatingPoint { int ops_embedded_ops_id[MAX_NUM_XLAYERS]; int ops_embedded_op_index[MAX_NUM_XLAYERS]; - int XCount; - int OpsxLayerID[MAX_NUM_XLAYERS]; - OpsColorInfo color_info; OpsDecoderModelInfo decoder_model_info; OpsMLayerInfo mlayer_info; diff --git a/av2/decoder/obu_ops.c b/av2/decoder/obu_ops.c index d98ba4a570..d538b93b83 100644 --- a/av2/decoder/obu_ops.c +++ b/av2/decoder/obu_ops.c @@ -180,12 +180,8 @@ uint32_t av2_read_operating_point_set_obu(struct AV2Decoder *pbi, if (obu_xlayer_id == GLOBAL_XLAYER_ID) { op->ops_xlayer_map = avm_rb_read_literal(rb, MAX_NUM_XLAYERS - 1); - int k = 0; for (int j = 0; j < MAX_NUM_XLAYERS - 1; j++) { if ((op->ops_xlayer_map & (1 << j))) { - op->OpsxLayerID[k] = j; - k++; - if (ops->ops_ptl_present_flag) { op->ops_seq_profile_idc[j] = avm_rb_read_literal(rb, PROFILE_BITS); @@ -245,10 +241,7 @@ uint32_t av2_read_operating_point_set_obu(struct AV2Decoder *pbi, } } } - op->XCount = k; } else { - op->XCount = 1; - op->OpsxLayerID[0] = obu_xlayer_id; assert(ops->ops_mlayer_info_idc == 1); read_ops_mlayer_info(obu_xlayer_id, &op->mlayer_info, rb); } diff --git a/test/ops_test.cc b/test/ops_test.cc index 975fe307cd..5c59f531fd 100644 --- a/test/ops_test.cc +++ b/test/ops_test.cc @@ -645,7 +645,6 @@ TEST_F(OpsTest, GlobalOpsNonContiguousXlayerMap) { const OperatingPoint *dop = &pbi_->ops_list[xlayer_id][0].op[0]; EXPECT_EQ(dop->ops_xlayer_map, 0x15); - EXPECT_EQ(dop->XCount, 3); EXPECT_EQ(dop->mlayer_info.OPMLayerCount[0], 1); EXPECT_EQ(dop->mlayer_info.OPMLayerCount[2], 1); EXPECT_EQ(dop->mlayer_info.OPMLayerCount[4], 1);