commit a009b7ad8b0a730ba78604e996501483464f5922
author huans <huans@google.com> Tue Jun 18 16:16:26 2019 -0700
committer Huan Song <huans@google.com> Thu Oct 10 11:38:56 2019 -0700
tree 943e4685369bd5fc8bdff7d554f9dc3186374808
parent 21694956f13e6630908602c2c7a999205ad3431e

Revert "Make a larger jpeg image size caputred by Camera HAL3"

Test: run CtsCameraTestCases

This reverts commit bc4a84a3979c3f3d6130923169917fd240345a99.

Change-Id: I29282b6e3444ce60e57ce8a0b217b452e5f7613b
Merged-In: I29282b6e3444ce60e57ce8a0b217b452e5f7613b

camera/fake-pipeline2/Sensor.cpp

diff --git a/camera/fake-pipeline2/Sensor.cpp b/camera/fake-pipeline2/Sensor.cpp
index 67aa1a6..6d52ff5 100644
--- a/camera/fake-pipeline2/Sensor.cpp
+++ b/camera/fake-pipeline2/Sensor.cpp
@@ -450,9 +450,9 @@
             }
             lastX = x;
             // TODO: Perfect demosaicing is a cheat
-            rCount = (pixel[Scene::R]+(outX+outY)%64) * scale64x;
-            gCount = (pixel[Scene::Gr]+(outX+outY)%64) * scale64x;
-            bCount = (pixel[Scene::B]+(outX+outY)%64) * scale64x;
+            rCount = pixel[Scene::R]  * scale64x;
+            gCount = pixel[Scene::Gr] * scale64x;
+            bCount = pixel[Scene::B]  * scale64x;
 
             *px++ = rCount < 255*64 ? rCount / 64 : 255;
             *px++ = gCount < 255*64 ? gCount / 64 : 255;
@@ -488,9 +488,9 @@
             }
             lastX = x;
            // TODO: Perfect demosaicing is a cheat
-            rCount = (pixel[Scene::R]+(outX+outY)%64)  * scale64x;
-            gCount = (pixel[Scene::Gr]+(outX+outY)%64) * scale64x;
-            bCount = (pixel[Scene::B]+(outX+outY)%64)  * scale64x;
+            rCount = pixel[Scene::R]  * scale64x;
+            gCount = pixel[Scene::Gr] * scale64x;
+            bCount = pixel[Scene::B]  * scale64x;
 
             *px++ = rCount < 255*64 ? rCount / 64 : 255;
             *px++ = gCount < 255*64 ? gCount / 64 : 255;
@@ -541,14 +541,11 @@
                 }
             }
             lastX = x;
-            //Slightly different color for the same Scene, result in larger
-            //jpeg image size requried by CTS test
-            //android.provider.cts.MediaStoreUiTest#testImageCapture
-            rCount = (pixel[Scene::R]+(outX+outY)%64)  * scale64x;
+            rCount = pixel[Scene::R]  * scale64x;
             rCount = rCount < saturationPoint ? rCount : saturationPoint;
-            gCount = (pixel[Scene::Gr]+(outX+outY)%64) * scale64x;
+            gCount = pixel[Scene::Gr] * scale64x;
             gCount = gCount < saturationPoint ? gCount : saturationPoint;
-            bCount = (pixel[Scene::B]+(outX+outY)%64)  * scale64x;
+            bCount = pixel[Scene::B]  * scale64x;
             bCount = bCount < saturationPoint ? bCount : saturationPoint;
             *pxY++ = (rgbToY[0] * rCount + rgbToY[1] * gCount + rgbToY[2] * bCount);
             if (outY % 2 == 0 && outX % 2 == 0) {