diff options
author | Alex Converse <aconverse@google.com> | 2016-01-21 19:17:56 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-21 19:17:56 +0000 |
commit | 4326cffa65065e30c36b26d8dc6b93237d45a08d (patch) | |
tree | 197837ed6e815e47e6a8567b5a276151e89deaae /vp9/encoder/vp9_pickmode.c | |
parent | a925173da0244d81db91c98f603751c951fdf547 (diff) | |
parent | 269428e35c3312233ff0ff66bda5752f70a274f6 (diff) | |
download | libvpx-4326cffa65065e30c36b26d8dc6b93237d45a08d.tar libvpx-4326cffa65065e30c36b26d8dc6b93237d45a08d.tar.gz libvpx-4326cffa65065e30c36b26d8dc6b93237d45a08d.tar.bz2 libvpx-4326cffa65065e30c36b26d8dc6b93237d45a08d.zip |
Merge "Tie the bit cost scale to a define."
Diffstat (limited to 'vp9/encoder/vp9_pickmode.c')
-rw-r--r-- | vp9/encoder/vp9_pickmode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index a691e2cd8..a9c52b154 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -702,8 +702,8 @@ static void block_yrd(VP9_COMP *cpi, MACROBLOCK *x, int *rate, int64_t *dist, } if (*skippable == 0) { - *rate <<= 10; - *rate += (eob_cost << 8); + *rate <<= (2 + VP9_PROB_COST_SHIFT); + *rate += (eob_cost << VP9_PROB_COST_SHIFT); } } #endif |