diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-10-18 17:44:19 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-10-18 17:44:19 -0700 |
| commit | 6d2a0da7a70855d8f16b62b16dcb4d16203d103d (patch) | |
| tree | e5b63917a16bb8d471212adb3df9acd4f8d45653 /vp9/encoder | |
| parent | 4e6c799e9f61fe8d03e99b34d9b0d1e3d5eaaa2e (diff) | |
| download | libvpx-6d2a0da7a70855d8f16b62b16dcb4d16203d103d.tar libvpx-6d2a0da7a70855d8f16b62b16dcb4d16203d103d.tar.gz libvpx-6d2a0da7a70855d8f16b62b16dcb4d16203d103d.tar.bz2 libvpx-6d2a0da7a70855d8f16b62b16dcb4d16203d103d.zip | |
Removing NUM_ prefix from constant names.
Renames for consistency with other constants:
NUM_FRAME_TYPES -> FRAME_TYPES
NUM_PARTITION_CONTEXTS -> PARTITION_CONTEXTS
Change-Id: I3db30acb2868eb0a424237c831087b2e264ec47f
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_block.h | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index ed795f031..ef8893b80 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1463,7 +1463,7 @@ static size_t write_compressed_header(VP9_COMP *cpi, uint8_t *data) { update_mbintra_mode_probs(cpi, &header_bc); - for (i = 0; i < NUM_PARTITION_CONTEXTS; ++i) { + for (i = 0; i < PARTITION_CONTEXTS; ++i) { vp9_prob pnew[PARTITION_TYPES - 1]; unsigned int bct[PARTITION_TYPES - 1][2]; update_mode(&header_bc, PARTITION_TYPES, diff --git a/vp9/encoder/vp9_block.h b/vp9/encoder/vp9_block.h index fe768046b..b4568f8c3 100644 --- a/vp9/encoder/vp9_block.h +++ b/vp9/encoder/vp9_block.h @@ -165,7 +165,7 @@ struct macroblock { PICK_MODE_CONTEXT sb32x64_context[2]; PICK_MODE_CONTEXT sb64x32_context[2]; PICK_MODE_CONTEXT sb64_context; - int partition_cost[NUM_PARTITION_CONTEXTS][PARTITION_TYPES]; + int partition_cost[PARTITION_CONTEXTS][PARTITION_TYPES]; BLOCK_SIZE b_partitioning[4][4][4]; BLOCK_SIZE mb_partitioning[4][4]; diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 2e5c7bc7e..4bf04561d 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -475,7 +475,7 @@ typedef struct VP9_COMP { int y_mode_count[4][INTRA_MODES]; int y_uv_mode_count[INTRA_MODES][INTRA_MODES]; - unsigned int partition_count[NUM_PARTITION_CONTEXTS][PARTITION_TYPES]; + unsigned int partition_count[PARTITION_CONTEXTS][PARTITION_TYPES]; nmv_context_counts NMVcount; diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 30cdb3f3c..bda8ba2d8 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -250,7 +250,7 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi) { fill_token_costs(cpi->mb.token_costs, cpi->common.fc.coef_probs); - for (i = 0; i < NUM_PARTITION_CONTEXTS; i++) + for (i = 0; i < PARTITION_CONTEXTS; i++) vp9_cost_tokens(cpi->mb.partition_cost[i], cpi->common.fc.partition_prob[cpi->common.frame_type][i], vp9_partition_tree); |