diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-12-05 09:14:46 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-12-05 09:14:46 -0800 |
| commit | 74050401423d1925dd8aef299e9af5806b070c63 (patch) | |
| tree | 38aacab377dd7d57ec2bae501c53fa75febe1354 /vp9/encoder | |
| parent | d345e65d3cae3efdb838560d3a2f259916126333 (diff) | |
| parent | 4cc657ec6e17ab975ebba43034d6de5aa8e413ee (diff) | |
| download | libvpx-74050401423d1925dd8aef299e9af5806b070c63.tar libvpx-74050401423d1925dd8aef299e9af5806b070c63.tar.gz libvpx-74050401423d1925dd8aef299e9af5806b070c63.tar.bz2 libvpx-74050401423d1925dd8aef299e9af5806b070c63.zip | |
Merge "Change to MV reference search." into experimental
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_block.h | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 3 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_block.h b/vp9/encoder/vp9_block.h index d5bf89c7d..4669d2ed6 100644 --- a/vp9/encoder/vp9_block.h +++ b/vp9/encoder/vp9_block.h @@ -70,7 +70,7 @@ typedef struct { PARTITION_INFO partition_info; int_mv best_ref_mv; int_mv second_best_ref_mv; - int_mv ref_mvs[MAX_REF_FRAMES][MAX_MV_REFS]; + int_mv ref_mvs[MAX_REF_FRAMES][MAX_MV_REF_CANDIDATES]; int rate; int distortion; int64_t intra_error; diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index d2008a775..6ab23cae0 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -395,8 +395,7 @@ static unsigned int pick_best_mv_ref(MACROBLOCK *x, vp9_mv_bit_cost(&target_mv, &mv_ref_list[0], x->nmvjointcost, x->mvcost, 96, xd->allow_high_precision_mv); - // Use 4 for now : for (i = 1; i < MAX_MV_REFS; ++i ) { - for (i = 1; i < 4; ++i) { + for (i = 1; i < MAX_MV_REF_CANDIDATES; ++i) { // If we see a 0,0 reference vector for a second time we have reached // the end of the list of valid candidate vectors. if (!mv_ref_list[i].as_int) { diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 8cabed9c9..448b56a08 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -3821,7 +3821,7 @@ static void encode_frame_to_data_rate { FILE *f = fopen("mv_ref_dist.stt", "a"); unsigned int i; - for (i = 0; i < MAX_MV_REFS; ++i) { + for (i = 0; i < MAX_MV_REF_CANDIDATES; ++i) { fprintf(f, "%10d", cpi->best_ref_index_counts[0][i]); } fprintf(f, "\n" ); diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 8180d16de..511e62f1c 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -790,7 +790,7 @@ typedef struct VP9_COMP { unsigned int switchable_interp_count[VP9_SWITCHABLE_FILTERS + 1] [VP9_SWITCHABLE_FILTERS]; #if CONFIG_NEW_MVREF - unsigned int best_ref_index_counts[MAX_REF_FRAMES][MAX_MV_REFS]; + unsigned int best_ref_index_counts[MAX_REF_FRAMES][MAX_MV_REF_CANDIDATES]; #endif } VP9_COMP; |