diff options
| author | Jingning Han <jingning@google.com> | 2013-04-25 09:18:01 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-25 09:18:01 -0700 |
| commit | b42b41c8566f1aa14aa94b63a6d8b6be4ca2bcff (patch) | |
| tree | ac17f76dc8b7920380cd3f78faf7c1990b6321fb /vp9/encoder/vp9_encodeframe.c | |
| parent | a426c7f343603c545e85a8ee1426e10b672297ef (diff) | |
| parent | b0e3b3df18ade11bd780642a11933df8e09514e9 (diff) | |
| download | libvpx-b42b41c8566f1aa14aa94b63a6d8b6be4ca2bcff.tar libvpx-b42b41c8566f1aa14aa94b63a6d8b6be4ca2bcff.tar.gz libvpx-b42b41c8566f1aa14aa94b63a6d8b6be4ca2bcff.tar.bz2 libvpx-b42b41c8566f1aa14aa94b63a6d8b6be4ca2bcff.zip | |
Merge "Move sbsegment out of experimental list" into experimental
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 7dc77d91f..65e6b18ea 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -772,7 +772,6 @@ static void encode_sb(VP9_COMP *cpi, (*tp)->token = EOSB_TOKEN; (*tp)++; } -#if CONFIG_SBSEGMENT } else if (is_sb == BLOCK_SIZE_SB16X32) { int i; @@ -809,7 +808,6 @@ static void encode_sb(VP9_COMP *cpi, (*tp)++; } } -#endif } else { int i; if (output_enabled) @@ -880,9 +878,7 @@ static void encode_sb64(VP9_COMP *cpi, (*tp)->token = EOSB_TOKEN; (*tp)++; - cpi->partition_count[pl][PARTITION_NONE]++; -#if CONFIG_SBSEGMENT } else if (is_sb[0] == BLOCK_SIZE_SB32X64) { int i; @@ -911,7 +907,6 @@ static void encode_sb64(VP9_COMP *cpi, (*tp)->token = EOSB_TOKEN; (*tp)++; } -#endif } else { int i; cpi->partition_count[pl][PARTITION_SPLIT]++; @@ -1020,7 +1015,6 @@ static void encode_sb_row(VP9_COMP *cpi, sb64_skip += splitmodes_used; } -#if CONFIG_SBSEGMENT // check 32x16 if (mb_col + x_idx + 1 < cm->mb_cols) { int r, d; @@ -1102,7 +1096,6 @@ static void encode_sb_row(VP9_COMP *cpi, vpx_memcpy(cm->left_context + y_idx, l2, sizeof(l2)); vpx_memcpy(cm->above_context + mb_col + x_idx, a2, sizeof(a2)); } -#endif if (!sb32_skip && !(mb_col + x_idx + 1 >= cm->mb_cols || mb_row + y_idx + 1 >= cm->mb_rows)) { @@ -1154,7 +1147,6 @@ static void encode_sb_row(VP9_COMP *cpi, pl = partition_plane_context(xd, BLOCK_SIZE_SB64X64); sb64_rate += x->partition_cost[pl][PARTITION_SPLIT]; -#if CONFIG_SBSEGMENT // check 64x32 if (mb_col + 3 < cm->mb_cols && !(cm->mb_rows & 1)) { int r, d; @@ -1234,7 +1226,6 @@ static void encode_sb_row(VP9_COMP *cpi, vpx_memcpy(cm->left_context, l, sizeof(l)); vpx_memcpy(cm->above_context + mb_col, a, sizeof(a)); } -#endif if (!sb64_skip && !(mb_col + 3 >= cm->mb_cols || mb_row + 3 >= cm->mb_rows)) { @@ -1544,7 +1535,6 @@ static void reset_skip_txfm_size(VP9_COMP *cpi, TX_SIZE txfm_max) { reset_skip_txfm_size_sb(cpi, mi, mis, txfm_max, cm->mb_rows - mb_row, cm->mb_cols - mb_col, BLOCK_SIZE_SB64X64); -#if CONFIG_SBSEGMENT } else if (mi->mbmi.sb_type == BLOCK_SIZE_SB64X32) { reset_skip_txfm_size_sb(cpi, mi, mis, txfm_max, cm->mb_rows - mb_row, cm->mb_cols - mb_col, @@ -1563,7 +1553,6 @@ static void reset_skip_txfm_size(VP9_COMP *cpi, TX_SIZE txfm_max) { cm->mb_rows - mb_row, cm->mb_cols - mb_col - 2, BLOCK_SIZE_SB32X64); -#endif } else { int i; @@ -1580,7 +1569,6 @@ static void reset_skip_txfm_size(VP9_COMP *cpi, TX_SIZE txfm_max) { cm->mb_rows - mb_row - y_idx_sb, cm->mb_cols - mb_col - x_idx_sb, BLOCK_SIZE_SB32X32); -#if CONFIG_SBSEGMENT } else if (sb_mi->mbmi.sb_type == BLOCK_SIZE_SB32X16) { reset_skip_txfm_size_sb(cpi, sb_mi, mis, txfm_max, cm->mb_rows - mb_row - y_idx_sb, @@ -1601,7 +1589,6 @@ static void reset_skip_txfm_size(VP9_COMP *cpi, TX_SIZE txfm_max) { cm->mb_rows - mb_row - y_idx_sb, cm->mb_cols - mb_col - x_idx_sb - 1, BLOCK_SIZE_SB16X32); -#endif } else { int m; |