diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-11-27 11:00:54 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-27 11:00:54 -0800 |
| commit | e2f1d02eb31bec994711cc9edb7d5eb0c0f7ffad (patch) | |
| tree | 4ea50a77d9842adb4dd0584aed2b3aed47396f72 /vp9/encoder/vp9_rdopt.c | |
| parent | e9c19617bfdd1274a75a0398aff5167852bac65c (diff) | |
| parent | f4bf712fbb94dee5871a834f3316ea05b357a51e (diff) | |
| download | libvpx-e2f1d02eb31bec994711cc9edb7d5eb0c0f7ffad.tar libvpx-e2f1d02eb31bec994711cc9edb7d5eb0c0f7ffad.tar.gz libvpx-e2f1d02eb31bec994711cc9edb7d5eb0c0f7ffad.tar.bz2 libvpx-e2f1d02eb31bec994711cc9edb7d5eb0c0f7ffad.zip | |
Merge "Moving mode encodings from common to encoder + cleanup."
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 0c61b0d9f..81d4c0016 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -290,15 +290,9 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi) { &cm->fc.nmvc, cm->allow_high_precision_mv, 1, 1); - for (i = 0; i < INTER_MODE_CONTEXTS; i++) { - MB_PREDICTION_MODE m; - - for (m = NEARESTMV; m < MB_MODE_COUNT; m++) - cpi->mb.inter_mode_cost[i][INTER_OFFSET(m)] = - cost_token(vp9_inter_mode_tree, - cm->fc.inter_mode_probs[i], - &vp9_inter_mode_encodings[INTER_OFFSET(m)]); - } + for (i = 0; i < INTER_MODE_CONTEXTS; ++i) + vp9_cost_tokens((int *)cpi->mb.inter_mode_cost[i], + cm->fc.inter_mode_probs[i], vp9_inter_mode_tree); } } |