merge per-segment lossless feature in misc_fixes

Change-Id: I56d56781d371c99aa5cdd2db1cbc0a17437723e9
This commit is contained in:
Yaowu Xu
2016-02-04 08:31:16 -08:00
parent 9909b5414e
commit 027cc8c873
2 changed files with 4 additions and 6 deletions

View File

@@ -3135,9 +3135,8 @@ static size_t read_uncompressed_header(VP10Decoder *pbi,
{
int i;
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;
const int qindex = 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 &&

View File

@@ -3906,9 +3906,8 @@ static void encode_frame_internal(VP10_COMP *cpi) {
rdc->ex_search_count = 0; // Exhaustive mesh search hits.
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;
const int qindex = 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 &&