Skip to content

Code cleanup: remove partition arg from pick_sb_modes #5229

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

Open
urvangjoshi wants to merge 1 commit into
base: av2-enc
Choose a base branch
from
Open

Code cleanup: remove partition arg from pick_sb_modes #5229

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
14 changes: 6 additions & 8 deletions av2/encoder/partition_search.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,6 @@ void av2_set_offsets(const AV2_COMP *const cpi, const TileInfo *const tile,
* MI_SIZE
* \param[in] rd_cost Pointer to structure holding rate and distortion
* stats for the current block
* \param[in] partition Partition mode of the parent block
* \param[in] cur_region_type Region type of the current block
* \param[in] sb_root_partition_info Partition information of the
* superblock \param[in] bsize Current block size \param[in] ctx
Expand All @@ -518,7 +517,7 @@ void av2_set_offsets(const AV2_COMP *const cpi, const TileInfo *const tile,
static void pick_sb_modes(AV2_COMP *const cpi, ThreadData *td,
TileDataEnc *tile_data, MACROBLOCK *const x,
int mi_row, int mi_col, RD_STATS *rd_cost,
PARTITION_TYPE partition, REGION_TYPE cur_region_type,
REGION_TYPE cur_region_type,
int sb_root_partition_info, BLOCK_SIZE bsize,
PICK_MODE_CONTEXT *ctx, RD_STATS best_rd) {
if (best_rd.rdcost < 0) {
Expand All @@ -545,7 +544,7 @@ static void pick_sb_modes(AV2_COMP *const cpi, ThreadData *td,

if (ctx->rd_mode_is_ready) {
assert(ctx->mic.sb_type[plane_type] == bsize);
assert(ctx->mic.partition == partition);
assert(ctx->mic.partition == PARTITION_NONE);
rd_cost->rate = ctx->rd_stats.rate;
rd_cost->dist = ctx->rd_stats.dist;
rd_cost->rdcost = ctx->rd_stats.rdcost;
Expand Down Expand Up @@ -576,7 +575,7 @@ static void pick_sb_modes(AV2_COMP *const cpi, ThreadData *td,
mbmi = xd->mi[0];
mbmi->sb_type[plane_type] = bsize;
if (xd->tree_type == SHARED_PART) mbmi->sb_type[PLANE_TYPE_UV] = bsize;
mbmi->partition = partition;
mbmi->partition = PARTITION_NONE;
mbmi->chroma_ref_info = ctx->chroma_ref_info;

#if CONFIG_RD_DEBUG
Expand Down Expand Up @@ -2493,9 +2492,8 @@ void av2_rd_use_partition(AV2_COMP *cpi, ThreadData *td, TileDataEnc *tile_data,
switch (partition) {
case PARTITION_NONE:
pick_sb_modes(cpi, td, tile_data, x, mi_row, mi_col, &last_part_rdc,
PARTITION_NONE, pc_tree->region_type,
pc_tree->sb_root_partition_info, bsize, ctx_none,
invalid_rdc);
pc_tree->region_type, pc_tree->sb_root_partition_info,
bsize, ctx_none, invalid_rdc);
break;
case PARTITION_HORZ:
pc_tree->horizontal[cur_region_type][0] = av2_alloc_pc_tree_node(
Expand Down Expand Up @@ -3708,7 +3706,7 @@ static void none_partition_search(
av2_set_best_mode_cache(x, sms_data->mode_cache);

// PARTITION_NONE evaluation and cost update.
pick_sb_modes(cpi, td, tile_data, x, mi_row, mi_col, this_rdc, PARTITION_NONE,
pick_sb_modes(cpi, td, tile_data, x, mi_row, mi_col, this_rdc,
pc_tree->region_type, pc_tree->sb_root_partition_info, bsize,
ctx_none, best_remain_rdcost);

Expand Down