commit a1dee6e35a5f71653f14679b12dc46a05f49d06b
author Sam Hasinoff <hasinoff@google.com> Thu Apr 19 13:08:16 2018 -0700
committer Zhijun He <zhijunhe@google.com> Mon Apr 30 20:25:37 2018 +0000
tree d1134e9dbe5974b4ac066aadca56f6f98a08125d
parent 58a1c16fa813d34fe45241014742f33aa93f2a3e

Fix definition of Bayer phase to match DNG SDK

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.

Test: build
Bug: 78294972
Change-Id: Ie60fb3370b80ed30c8c05505dcfdc873746e244a

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();