commit 6c6abaaf95d0fd7b416dc5a16badf281f5ec0b58
author Sam Hasinoff <hasinoff@google.com> Mon Apr 30 14:14:52 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 30 14:14:52 2018 -0700
tree bc49d06a2c41cf88106e767aad1995c7282f627d
parent 4757191a0052c61bd0141b090b886f90516486d5
parent fc84c3e6b35ec814553a192cb7f674d4c8d224ba

Fix definition of Bayer phase to match DNG SDK am: a1dee6e35a
am: fc84c3e6b3

Change-Id: I927653073a671e91b1a4961e5e99ae245886a4fc

media/img_utils/include/img_utils/DngUtils.h

diff --git a/media/img_utils/include/img_utils/DngUtils.h b/media/img_utils/include/img_utils/DngUtils.h
index 1d8df9c..de8f120 100644
--- a/media/img_utils/include/img_utils/DngUtils.h
+++ b/media/img_utils/include/img_utils/DngUtils.h
@@ -39,11 +39,16 @@
  */
 class ANDROID_API OpcodeListBuilder : public LightRefBase<OpcodeListBuilder> {
     public:
+        // Note that the Adobe DNG 1.4 spec for Bayer phase (defined for the
+        // FixBadPixelsConstant and FixBadPixelsList opcodes) is incorrect. It's
+        // inconsistent with the DNG SDK (cf. dng_negative::SetBayerMosaic and
+        // dng_opcode_FixBadPixelsList::IsGreen), and Adobe confirms that the
+        // spec should be updated to match the SDK.
         enum CfaLayout {
-            CFA_RGGB = 0,
-            CFA_GRBG,
-            CFA_GBRG,
+            CFA_GRBG = 0,
+            CFA_RGGB,
             CFA_BGGR,
+            CFA_GBRG,
         };
 
         OpcodeListBuilder();