diff options
| author | Hui Su <huisu@google.com> | 2018-10-16 20:58:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-16 20:58:45 +0000 |
| commit | 21bb9e3a09c25703d04b5b67ae3a6b0190a4496d (patch) | |
| tree | 0375ab936a40673cfc5e8b3361a7bca210d5137c | |
| parent | e56b1db67a7c9a58943f25f85a04289d8e3bf096 (diff) | |
| parent | 2bc3d47dd1fb65bd718116b4afb607c961a06872 (diff) | |
| download | libvpx-21bb9e3a09c25703d04b5b67ae3a6b0190a4496d.tar libvpx-21bb9e3a09c25703d04b5b67ae3a6b0190a4496d.tar.gz libvpx-21bb9e3a09c25703d04b5b67ae3a6b0190a4496d.tar.bz2 libvpx-21bb9e3a09c25703d04b5b67ae3a6b0190a4496d.zip | |
Merge "Fix a bug in ml_prune_rect_partition()"
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 0d727ab00..bdd5b39c1 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3303,7 +3303,12 @@ static void ml_prune_rect_partition(VP9_COMP *const cpi, MACROBLOCK *const x, { const int64_t none_rdcost = pc_tree->none.rdcost; const VP9_COMMON *const cm = &cpi->common; +#if CONFIG_VP9_HIGHBITDEPTH + const int dc_q = + vp9_dc_quant(cm->base_qindex, 0, cm->bit_depth) >> (x->e_mbd.bd - 8); +#else const int dc_q = vp9_dc_quant(cm->base_qindex, 0, cm->bit_depth); +#endif // CONFIG_VP9_HIGHBITDEPTH int feature_index = 0; unsigned int block_var = 0; unsigned int sub_block_var[4] = { 0 }; |