Merge branch 'master' into nextgenv2

Change-Id: Id0b784b115602e2502b42fa972a5ae210435a3be
This commit is contained in:
Yaowu Xu
2015-12-11 08:57:43 -08:00
19 changed files with 414 additions and 165 deletions

View File

@@ -1230,10 +1230,12 @@ static void setup_quantization(VP10_COMMON *const cm, MACROBLOCKD *const xd,
cm->uv_dc_delta_q = read_delta_q(rb);
cm->uv_ac_delta_q = read_delta_q(rb);
cm->dequant_bit_depth = cm->bit_depth;
for (i = 0; i < (cm->seg.enabled ? MAX_SEGMENTS : 1); ++i) {
const int qindex = vp10_get_qindex(&cm->seg, i, cm->base_qindex);
xd->lossless[i] = cm->y_dc_delta_q == 0 &&
qindex == 0 &&
for (i = 0; i < MAX_SEGMENTS; ++i) {
const int qindex = CONFIG_MISC_FIXES && cm->seg.enabled ?
vp10_get_qindex(&cm->seg, i, cm->base_qindex) :
cm->base_qindex;
xd->lossless[i] = qindex == 0 &&
cm->y_dc_delta_q == 0 &&
cm->uv_dc_delta_q == 0 &&
cm->uv_ac_delta_q == 0;
}