Commit a66b68c7 authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review
Browse files

Merge "Return rate and distortion cost values from non-RD mode decision"

parents 7c6337ba ca0625ff
...@@ -327,6 +327,8 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -327,6 +327,8 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
if (this_rd < best_rd) { if (this_rd < best_rd) {
best_rd = this_rd; best_rd = this_rd;
*returnrate = rate;
*returndistortion = dist;
best_mode = this_mode; best_mode = this_mode;
best_ref_frame = ref_frame; best_ref_frame = ref_frame;
} }
...@@ -353,6 +355,8 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -353,6 +355,8 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
if (this_rd + intra_mode_cost < best_rd) { if (this_rd + intra_mode_cost < best_rd) {
best_rd = this_rd; best_rd = this_rd;
*returnrate = rate;
*returndistortion = dist;
mbmi->mode = this_mode; mbmi->mode = this_mode;
mbmi->ref_frame[0] = INTRA_FRAME; mbmi->ref_frame[0] = INTRA_FRAME;
mbmi->uv_mode = this_mode; mbmi->uv_mode = this_mode;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment