Merge "camera_metadata: Update the aberration correction related tag names" into lmp-dev

4 files changed, 41 insertions, 43 deletions

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 9e665b1c..fabf3390 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -120,7 +120,7 @@
             <li
             ><a href="#controls_android.colorCorrection.gains">android.colorCorrection.gains</a></li>
             <li
-            ><a href="#controls_android.colorCorrection.aberrationCorrectionMode">android.colorCorrection.aberrationCorrectionMode</a></li>
+            ><a href="#controls_android.colorCorrection.aberrationMode">android.colorCorrection.aberrationMode</a></li>
           </ul>
         </li>
         <li>
@@ -133,14 +133,14 @@
             <li
             ><a href="#dynamic_android.colorCorrection.gains">android.colorCorrection.gains</a></li>
             <li
-            ><a href="#dynamic_android.colorCorrection.aberrationCorrectionMode">android.colorCorrection.aberrationCorrectionMode</a></li>
+            ><a href="#dynamic_android.colorCorrection.aberrationMode">android.colorCorrection.aberrationMode</a></li>
           </ul>
         </li>
         <li>
           <span class="toc_kind_header">static</span>
           <ul class="toc_section">
             <li
-            ><a href="#static_android.colorCorrection.availableAberrationCorrectionModes">android.colorCorrection.availableAberrationCorrectionModes</a></li>
+            ><a href="#static_android.colorCorrection.availableAberrationModes">android.colorCorrection.availableAberrationModes</a></li>
           </ul>
         </li>
       </ul> <!-- toc_section -->
@@ -1324,10 +1324,10 @@ channels,<wbr/> it must use the <code>G_<wbr/>even</code> value,<wbr/> and write
            <!-- end of entry -->
         
                 
-          <tr class="entry" id="controls_android.colorCorrection.aberrationCorrectionMode">
+          <tr class="entry" id="controls_android.colorCorrection.aberrationMode">
             <td class="entry_name
              " rowspan="3">
-              android.<wbr/>color<wbr/>Correction.<wbr/>aberration<wbr/>Correction<wbr/>Mode
+              android.<wbr/>color<wbr/>Correction.<wbr/>aberration<wbr/>Mode
             </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -1376,7 +1376,7 @@ capture rate (relative to sensor raw output).<wbr/></p></span>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
               <p>This must be set to a valid mode from
-<a href="#static_android.colorCorrection.availableAberrationCorrectionModes">android.<wbr/>color<wbr/>Correction.<wbr/>available<wbr/>Aberration<wbr/>Correction<wbr/>Modes</a>.<wbr/></p>
+<a href="#static_android.colorCorrection.availableAberrationModes">android.<wbr/>color<wbr/>Correction.<wbr/>available<wbr/>Aberration<wbr/>Modes</a>.<wbr/></p>
 <p>Chromatic (color) aberration is caused by the fact that different wavelengths of light
 can not focus on the same point after exiting from the lens.<wbr/> This metadata defines
 the high level control of chromatic aberration correction algorithm,<wbr/> which aims to
@@ -1665,10 +1665,10 @@ channels,<wbr/> it must use the <code>G_<wbr/>even</code> value,<wbr/> and write
            <!-- end of entry -->
         
                 
-          <tr class="entry" id="dynamic_android.colorCorrection.aberrationCorrectionMode">
+          <tr class="entry" id="dynamic_android.colorCorrection.aberrationMode">
             <td class="entry_name
              " rowspan="3">
-              android.<wbr/>color<wbr/>Correction.<wbr/>aberration<wbr/>Correction<wbr/>Mode
+              android.<wbr/>color<wbr/>Correction.<wbr/>aberration<wbr/>Mode
             </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
@@ -1717,7 +1717,7 @@ capture rate (relative to sensor raw output).<wbr/></p></span>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
               <p>This must be set to a valid mode from
-<a href="#static_android.colorCorrection.availableAberrationCorrectionModes">android.<wbr/>color<wbr/>Correction.<wbr/>available<wbr/>Aberration<wbr/>Correction<wbr/>Modes</a>.<wbr/></p>
+<a href="#static_android.colorCorrection.availableAberrationModes">android.<wbr/>color<wbr/>Correction.<wbr/>available<wbr/>Aberration<wbr/>Modes</a>.<wbr/></p>
 <p>Chromatic (color) aberration is caused by the fact that different wavelengths of light
 can not focus on the same point after exiting from the lens.<wbr/> This metadata defines
 the high level control of chromatic aberration correction algorithm,<wbr/> which aims to
@@ -1763,10 +1763,10 @@ applying aberration correction.<wbr/></p>
         
 
                 
-          <tr class="entry" id="static_android.colorCorrection.availableAberrationCorrectionModes">
+          <tr class="entry" id="static_android.colorCorrection.availableAberrationModes">
             <td class="entry_name
              " rowspan="3">
-              android.<wbr/>color<wbr/>Correction.<wbr/>available<wbr/>Aberration<wbr/>Correction<wbr/>Modes
+              android.<wbr/>color<wbr/>Correction.<wbr/>available<wbr/>Aberration<wbr/>Modes
             </td>
             <td class="entry_type">
                 <span class="entry_type_name">byte</span>
@@ -1793,7 +1793,7 @@ applying aberration correction.<wbr/></p>
 
             <td class="entry_range">
               <p>The subset of aberration correction mode from those specified in
-<a href="#controls_android.colorCorrection.aberrationCorrectionMode">android.<wbr/>color<wbr/>Correction.<wbr/>aberration<wbr/>Correction<wbr/>Mode</a>.<wbr/></p>
+<a href="#controls_android.colorCorrection.aberrationMode">android.<wbr/>color<wbr/>Correction.<wbr/>aberration<wbr/>Mode</a>.<wbr/></p>
             </td>
 
             <td class="entry_tags">
@@ -1808,7 +1808,7 @@ applying aberration correction.<wbr/></p>
           </tr>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
-              <p>This metadata lists the valid modes for <a href="#controls_android.colorCorrection.aberrationCorrectionMode">android.<wbr/>color<wbr/>Correction.<wbr/>aberration<wbr/>Correction<wbr/>Mode</a>.<wbr/>
+              <p>This metadata lists the valid modes for <a href="#controls_android.colorCorrection.aberrationMode">android.<wbr/>color<wbr/>Correction.<wbr/>aberration<wbr/>Mode</a>.<wbr/>
 If no aberration correction modes are available for a device,<wbr/> this list will solely include
 OFF mode.<wbr/></p>
 <p>For FULL capability device (<a href="#static_android.info.supportedHardwareLevel">android.<wbr/>info.<wbr/>supported<wbr/>Hardware<wbr/>Level</a> <code>==</code> FULL),<wbr/> OFF must be
@@ -13090,8 +13090,8 @@ stages.<wbr/> This means the following controls are guaranteed to be supported:<
 </ul>
 </li>
 <li>Manual aberration correction control (if aberration correction is supported)<ul>
-<li><a href="#controls_android.colorCorrection.aberrationCorrectionMode">android.<wbr/>color<wbr/>Correction.<wbr/>aberration<wbr/>Correction<wbr/>Mode</a></li>
-<li><a href="#static_android.colorCorrection.availableAberrationCorrectionModes">android.<wbr/>color<wbr/>Correction.<wbr/>available<wbr/>Aberration<wbr/>Correction<wbr/>Modes</a></li>
+<li><a href="#controls_android.colorCorrection.aberrationMode">android.<wbr/>color<wbr/>Correction.<wbr/>aberration<wbr/>Mode</a></li>
+<li><a href="#static_android.colorCorrection.availableAberrationModes">android.<wbr/>color<wbr/>Correction.<wbr/>available<wbr/>Aberration<wbr/>Modes</a></li>
 </ul>
 </li>
 </ul>
@@ -22449,7 +22449,7 @@ to know when sensor settings have been applied.<wbr/></p>
         New features for first camera 2 release (API1)
     
         <ul class="tags_entries">
-          <li><a href="#static_android.colorCorrection.availableAberrationCorrectionModes">android.colorCorrection.availableAberrationCorrectionModes</a> (static)</li>
+          <li><a href="#static_android.colorCorrection.availableAberrationModes">android.colorCorrection.availableAberrationModes</a> (static)</li>
           <li><a href="#static_android.control.availableHighSpeedVideoConfigurations">android.control.availableHighSpeedVideoConfigurations</a> (static)</li>
           <li><a href="#controls_android.edge.mode">android.edge.mode</a> (controls)</li>
           <li><a href="#static_android.edge.availableEdgeModes">android.edge.availableEdgeModes</a> (static)</li>
diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index b6064c52..816790a8 100644
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -269,7 +269,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           `G_odd` equal to `G_even` in the output result metadata.
           </hal_details>
         </entry>
-        <entry name="aberrationCorrectionMode" type="byte" visibility="public" enum="true">
+        <entry name="aberrationMode" type="byte" visibility="public" enum="true">
           <enum>
             <value>OFF
               <notes>
@@ -294,7 +294,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </description>
           <details>
             This must be set to a valid mode from
-            android.colorCorrection.availableAberrationCorrectionModes.
+            android.colorCorrection.availableAberrationModes.
 
             Chromatic (color) aberration is caused by the fact that different wavelengths of light
             can not focus on the same point after exiting from the lens. This metadata defines
@@ -317,11 +317,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
         </clone>
         <clone entry="android.colorCorrection.gains" kind="controls">
         </clone>
-        <clone entry="android.colorCorrection.aberrationCorrectionMode" kind="controls">
+        <clone entry="android.colorCorrection.aberrationMode" kind="controls">
         </clone>
       </dynamic>
       <static>
-        <entry name="availableAberrationCorrectionModes" type="byte" visibility="public"
+        <entry name="availableAberrationModes" type="byte" visibility="public"
         type_notes="list of enums" container="array" typedef="enumList">
           <array>
             <size>n</size>
@@ -331,10 +331,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </description>
           <range>
             The subset of aberration correction mode from those specified in
-            android.colorCorrection.aberrationCorrectionMode.
+            android.colorCorrection.aberrationMode.
           </range>
           <details>
-            This metadata lists the valid modes for android.colorCorrection.aberrationCorrectionMode.
+            This metadata lists the valid modes for android.colorCorrection.aberrationMode.
             If no aberration correction modes are available for a device, this list will solely include
             OFF mode.
 
@@ -3641,8 +3641,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
                     * android.statistics.lensShadingMap
                     * android.lens.info.shadingMapSize
               * Manual aberration correction control (if aberration correction is supported)
-                    * android.colorCorrection.aberrationCorrectionMode
-                    * android.colorCorrection.availableAberrationCorrectionModes
+                    * android.colorCorrection.aberrationMode
+                    * android.colorCorrection.availableAberrationModes
 
               If auto white balance is enabled, then the camera device
               will accurately report the values applied by AWB in the result.
diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h
index 3f3213ab..c66ae3e3 100644
--- a/camera/include/system/camera_metadata_tags.h
+++ b/camera/include/system/camera_metadata_tags.h
@@ -107,9 +107,8 @@ typedef enum camera_metadata_tag {
             ANDROID_COLOR_CORRECTION_START,
     ANDROID_COLOR_CORRECTION_TRANSFORM,               // rational[]   | public
     ANDROID_COLOR_CORRECTION_GAINS,                   // float[]      | public
-    ANDROID_COLOR_CORRECTION_ABERRATION_CORRECTION_MODE,
-                                                      // enum         | public
-    ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES,
+    ANDROID_COLOR_CORRECTION_ABERRATION_MODE,         // enum         | public
+    ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,
                                                       // byte[]       | public
     ANDROID_COLOR_CORRECTION_END,
 
@@ -390,12 +389,12 @@ typedef enum camera_metadata_enum_android_color_correction_mode {
     ANDROID_COLOR_CORRECTION_MODE_HIGH_QUALITY,
 } camera_metadata_enum_android_color_correction_mode_t;
 
-// ANDROID_COLOR_CORRECTION_ABERRATION_CORRECTION_MODE
-typedef enum camera_metadata_enum_android_color_correction_aberration_correction_mode {
-    ANDROID_COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_OFF,
-    ANDROID_COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_FAST,
-    ANDROID_COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_HIGH_QUALITY,
-} camera_metadata_enum_android_color_correction_aberration_correction_mode_t;
+// ANDROID_COLOR_CORRECTION_ABERRATION_MODE
+typedef enum camera_metadata_enum_android_color_correction_aberration_mode {
+    ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF,
+    ANDROID_COLOR_CORRECTION_ABERRATION_MODE_FAST,
+    ANDROID_COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY,
+} camera_metadata_enum_android_color_correction_aberration_mode_t;
 
 
 // ANDROID_CONTROL_AE_ANTIBANDING_MODE
diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c
index 0e68e090..ec383e3d 100644
--- a/camera/src/camera_metadata_tag_info.c
+++ b/camera/src/camera_metadata_tag_info.c
@@ -117,11 +117,10 @@ static tag_info_t android_color_correction[ANDROID_COLOR_CORRECTION_END -
                 },
     [ ANDROID_COLOR_CORRECTION_GAINS - ANDROID_COLOR_CORRECTION_START ] =
     { "gains",                         TYPE_FLOAT  },
-    [ ANDROID_COLOR_CORRECTION_ABERRATION_CORRECTION_MODE - ANDROID_COLOR_CORRECTION_START ] =
-    { "aberrationCorrectionMode",      TYPE_BYTE   },
-    [ ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES - ANDROID_COLOR_CORRECTION_START ] =
-    { "availableAberrationCorrectionModes",
-                                        TYPE_BYTE   },
+    [ ANDROID_COLOR_CORRECTION_ABERRATION_MODE - ANDROID_COLOR_CORRECTION_START ] =
+    { "aberrationMode",                TYPE_BYTE   },
+    [ ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES - ANDROID_COLOR_CORRECTION_START ] =
+    { "availableAberrationModes",      TYPE_BYTE   },
 };
 
 static tag_info_t android_control[ANDROID_CONTROL_END -
@@ -671,17 +670,17 @@ int camera_metadata_enum_snprint(uint32_t tag,
         case ANDROID_COLOR_CORRECTION_GAINS: {
             break;
         }
-        case ANDROID_COLOR_CORRECTION_ABERRATION_CORRECTION_MODE: {
+        case ANDROID_COLOR_CORRECTION_ABERRATION_MODE: {
             switch (value) {
-                case ANDROID_COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_OFF:
+                case ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF:
                     msg = "OFF";
                     ret = 0;
                     break;
-                case ANDROID_COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_FAST:
+                case ANDROID_COLOR_CORRECTION_ABERRATION_MODE_FAST:
                     msg = "FAST";
                     ret = 0;
                     break;
-                case ANDROID_COLOR_CORRECTION_ABERRATION_CORRECTION_MODE_HIGH_QUALITY:
+                case ANDROID_COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY:
                     msg = "HIGH_QUALITY";
                     ret = 0;
                     break;
@@ -690,7 +689,7 @@ int camera_metadata_enum_snprint(uint32_t tag,
             }
             break;
         }
-        case ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_CORRECTION_MODES: {
+        case ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES: {
             break;
         }