Skip to content

Remove unused XCount and OpsxLayerID globals #5250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
asegallamz wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Remove unused XCount and OpsxLayerID globals #5250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions av2/common/av2_common_int.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions av2/decoder/obu_ops.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
}
Expand Down
1 change: 0 additions & 1 deletion test/ops_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down