Commit 2a39296d authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

Merge "Fix encoder failure in segmentation mode" into nextgenv2

parents 88fe7871 e729d28c
...@@ -168,14 +168,12 @@ static void count_segs_sb(const VP10_COMMON *cm, MACROBLOCKD *xd, ...@@ -168,14 +168,12 @@ static void count_segs_sb(const VP10_COMMON *cm, MACROBLOCKD *xd,
#if CONFIG_EXT_PARTITION_TYPES #if CONFIG_EXT_PARTITION_TYPES
PARTITION_TYPE partition; PARTITION_TYPE partition;
#else #else
const int bw = num_8x8_blocks_wide_lookup[mi[0]->mbmi.sb_type]; int bw, bh;
const int bh = num_8x8_blocks_high_lookup[mi[0]->mbmi.sb_type];
#endif // CONFIG_EXT_PARTITION_TYPES #endif // CONFIG_EXT_PARTITION_TYPES
if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols) if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols)
return; return;
#if CONFIG_EXT_PARTITION_TYPES #if CONFIG_EXT_PARTITION_TYPES
if (bsize == BLOCK_8X8) if (bsize == BLOCK_8X8)
partition = PARTITION_NONE; partition = PARTITION_NONE;
...@@ -263,6 +261,9 @@ static void count_segs_sb(const VP10_COMMON *cm, MACROBLOCKD *xd, ...@@ -263,6 +261,9 @@ static void count_segs_sb(const VP10_COMMON *cm, MACROBLOCKD *xd,
assert(0); assert(0);
} }
#else #else
bw = num_8x8_blocks_wide_lookup[mi[0]->mbmi.sb_type];
bh = num_8x8_blocks_high_lookup[mi[0]->mbmi.sb_type];
if (bw == bs && bh == bs) { if (bw == bs && bh == bs) {
count_segs(cm, xd, tile, mi, no_pred_segcounts, temporal_predictor_count, count_segs(cm, xd, tile, mi, no_pred_segcounts, temporal_predictor_count,
t_unpred_seg_counts, bs, bs, mi_row, mi_col); t_unpred_seg_counts, bs, bs, mi_row, mi_col);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment