From: Chien-Yu Chen <cychen@google.com>
Date: Fri, 19 Jan 2018 18:50:17 +0000 (-0800)
Subject: camera: Modify AF scene change
X-Git-Tag: android-x86-9.0-r1~34^2^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c357faa4ab56185175c455aa277d22c81b45649a;p=android-x86%2Fsystem-media.git

camera: Modify AF scene change

Change type to byte because int32 and enum cause type mismatch.
Allow DETECT in all AF modes.

Test: CTS
Bug: 64847201
Change-Id: I61e4b37fda8b29a67026cd567d4fa414afe90231
---

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 5b07e4db..1cb89554 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -9418,7 +9418,7 @@ capture intent.<wbr/></p>
               android.<wbr/>control.<wbr/>af<wbr/>Scene<wbr/>Change
             </td>
             <td class="entry_type">
-                <span class="entry_type_name entry_type_name_enum">int32</span>
+                <span class="entry_type_name entry_type_name_enum">byte</span>
 
               <span class="entry_type_visibility"> [public]</span>
 
@@ -9468,8 +9468,6 @@ such as a large shift in camera viewpoint,<wbr/> significant motion in the scene
 significant illumination change,<wbr/> this value will be set to DETECTED for a single capture
 result.<wbr/> Otherwise the value will be NOT_<wbr/>DETECTED.<wbr/> The threshold for detection is similar
 to what would trigger a new passive focus scan to begin in CONTINUOUS autofocus modes.<wbr/></p>
-<p>afSceneChange may be DETECTED only if afMode is AF_<wbr/>MODE_<wbr/>CONTINUOUS_<wbr/>VIDEO or
-AF_<wbr/>MODE_<wbr/>CONTINUOUS_<wbr/>PICTURE.<wbr/> In other AF modes,<wbr/> afSceneChange must be NOT_<wbr/>DETECTED.<wbr/></p>
 <p>This key will be available if the camera device advertises this key via <a href="https://developer.android.com/reference/android/hardware/camera2/CameraCharacteristics.html#getAvailableCaptureResultKeys">CameraCharacteristics#getAvailableCaptureResultKeys</a>.<wbr/></p>
             </td>
           </tr>
diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml
index 877b5fb9..38f63664 100644
--- a/camera/docs/metadata_definitions.xml
+++ b/camera/docs/metadata_definitions.xml
@@ -2894,7 +2894,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
       <dynamic>
         <clone entry="android.control.enableZsl" kind="controls">
         </clone>
-        <entry name="afSceneChange" type="int32" visibility="public" enum="true" hal_version="3.3">
+        <entry name="afSceneChange" type="byte" visibility="public" enum="true" hal_version="3.3">
           <enum>
             <value>NOT_DETECTED
             <notes>Scene change is not detected within the AF region(s).</notes></value>
@@ -2909,9 +2909,6 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           result. Otherwise the value will be NOT_DETECTED. The threshold for detection is similar
           to what would trigger a new passive focus scan to begin in CONTINUOUS autofocus modes.
 
-          afSceneChange may be DETECTED only if afMode is AF_MODE_CONTINUOUS_VIDEO or
-          AF_MODE_CONTINUOUS_PICTURE. In other AF modes, afSceneChange must be NOT_DETECTED.
-
           This key will be available if the camera device advertises this key via {@link
           android.hardware.camera2.CameraCharacteristics#getAvailableCaptureResultKeys|ACAMERA_REQUEST_AVAILABLE_RESULT_KEYS}.
           </details>
diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c
index fe60b988..4c57d865 100644
--- a/camera/src/camera_metadata_tag_info.c
+++ b/camera/src/camera_metadata_tag_info.c
@@ -219,7 +219,7 @@ static tag_info_t android_control[ANDROID_CONTROL_END -
     [ ANDROID_CONTROL_ENABLE_ZSL - ANDROID_CONTROL_START ] =
     { "enableZsl",                     TYPE_BYTE   },
     [ ANDROID_CONTROL_AF_SCENE_CHANGE - ANDROID_CONTROL_START ] =
-    { "afSceneChange",                 TYPE_INT32  },
+    { "afSceneChange",                 TYPE_BYTE   },
 };
 
 static tag_info_t android_demosaic[ANDROID_DEMOSAIC_END -