merge per-segment lossless feature in misc_fixes

Change-Id: I56d56781d371c99aa5cdd2db1cbc0a17437723e9

diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index 36f620ecc171b2642281745264612c3ed128fbf1..7bc46be2230bb959965c3f0f80a5e1002df0d513 100644 (file)
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -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 &&

diff --git a/vp10/encoder/encodeframe.c b/vp10/encoder/encodeframe.c
index f903ae44d75d5e24943474641345602ce34ccbae..9af936de41b52c792cbd261cbbc1dcc32c49a06a 100644 (file)
--- a/vp10/encoder/encodeframe.c
+++ b/vp10/encoder/encodeframe.c
@@ -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 &&