camera_metadata: Rename DNG capability to RAW.

While this capability allows for saving DNG files, it's
really about the camera device producing usable RAW data, either
for application processing or saving as a DNG.

Leave in the DNG name as an alias to ease transition; it
will be removed when the next metadata update is made.

Bug: 15415688
Change-Id: I1ea9f65b03c4fa06a5004f9d1d485935742001c8

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 4aae59a..92087c8 100644 (file)
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -3107,8 +3107,7 @@ use case.<wbr/></p></span>
 image while recording video) use case.<wbr/></p>
 <p>The camera device should take the highest-quality image
 possible (given the other settings) without disrupting the
-frame rate of video recording.<wbr/><br/>
-</p></span>
+frame rate of video recording.<wbr/>  </p></span>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">ZERO_SHUTTER_LAG</span>
@@ -6761,8 +6760,7 @@ use case.<wbr/></p></span>
 image while recording video) use case.<wbr/></p>
 <p>The camera device should take the highest-quality image
 possible (given the other settings) without disrupting the
-frame rate of video recording.<wbr/><br/>
-</p></span>
+frame rate of video recording.<wbr/>  </p></span>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">ZERO_SHUTTER_LAG</span>
@@ -8727,7 +8725,7 @@ of reducing frame rate relative to sensor raw output.<wbr/></p>
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -8812,7 +8810,7 @@ camera device.<wbr/></p>
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -8918,7 +8916,7 @@ of reducing frame rate relative to sensor raw output.<wbr/></p>
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -13082,10 +13080,13 @@ will accurately report the values applied by AWB in the result.<wbr/></p>
 controls,<wbr/> but this capability only covers the above list of controls.<wbr/></p></span>
                   </li>
                   <li>
-                    <span class="entry_type_enum_name">DNG</span>
+                    <span class="entry_type_enum_name">RAW</span>
                     <span class="entry_type_enum_optional">[optional]</span>
-                    <span class="entry_type_enum_notes"><p>The camera device supports outputting RAW buffers that can be
-saved offline into a DNG format.<wbr/></p>
+                    <span class="entry_type_enum_notes"><p>The camera device supports outputting RAW buffers and
+metadata for interpreting them.<wbr/></p>
+<p>Devices supporting the RAW capability allow both for
+saving DNG files,<wbr/> and for direct application processing of
+raw sensor images.<wbr/></p>
 <ul>
 <li>RAW_<wbr/>SENSOR is supported as an output format.<wbr/></li>
 <li>The maximum available resolution for RAW_<wbr/>SENSOR streams
@@ -14505,17 +14506,17 @@ if its dependent capability is supported:</p>
 <tr>
 <td align="left">RAW_<wbr/>OPAQUE</td>
 <td align="left">RAW16</td>
-<td align="left">DNG</td>
+<td align="left">RAW</td>
 </tr>
 <tr>
 <td align="left">RAW16</td>
 <td align="left">YUV_<wbr/>420_<wbr/>888</td>
-<td align="left">DNG</td>
+<td align="left">RAW</td>
 </tr>
 <tr>
 <td align="left">RAW16</td>
 <td align="left">JPEG</td>
-<td align="left">DNG</td>
+<td align="left">RAW</td>
 </tr>
 </tbody>
 </table>
@@ -14554,7 +14555,7 @@ for (size_<wbr/>t i = 0; i &lt; entry.<wbr/>count; ) {
     i += length;
 }
 
-//<wbr/> writing (static example,<wbr/> DNG+ZSL)
+//<wbr/> writing (static example,<wbr/> RAW+ZSL)
 int32_<wbr/>t[] contents = {
   RAW_<wbr/>OPAQUE,<wbr/> 3,<wbr/> RAW16,<wbr/> YUV_<wbr/>420_<wbr/>888,<wbr/> BLOB,<wbr/>
   RAW16,<wbr/> 2,<wbr/> YUV_<wbr/>420_<wbr/>888,<wbr/> BLOB,<wbr/>
@@ -15857,7 +15858,7 @@ active pixels.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -15984,7 +15985,7 @@ the sensor,<wbr/> in reading order.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -16240,7 +16241,7 @@ including black calibration pixels.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
                   <li><a href="#tag_BC">BC</a></li>
               </ul>
             </td>
@@ -16295,7 +16296,7 @@ raw sensor image will include black pixels.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -16514,7 +16515,7 @@ calculating the <a href="#static_android.sensor.colorTransform1">android.<wbr/>s
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -16542,7 +16543,8 @@ information for improved quality,<wbr/> including
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
               <p>The first reference illuminant (<a href="#static_android.sensor.referenceIlluminant1">android.<wbr/>sensor.<wbr/>reference<wbr/>Illuminant1</a>)
-and corresponding matrices must be present to support DNG output.<wbr/></p>
+and corresponding matrices must be present to support the RAW capability
+and DNG output.<wbr/></p>
 <p>When producing raw images with a color profile that has only been
 calibrated against a single light source,<wbr/> it is valid to omit
 <a href="#static_android.sensor.referenceIlluminant2">android.<wbr/>sensor.<wbr/>reference<wbr/>Illuminant2</a> along with the
@@ -16596,7 +16598,7 @@ calculating the <a href="#static_android.sensor.colorTransform2">android.<wbr/>s
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -16654,7 +16656,7 @@ reference sensor colorspace to the actual device sensor colorspace.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -16715,7 +16717,7 @@ reference sensor colorspace to the actual device sensor colorspace
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -16777,7 +16779,7 @@ reference sensor color space.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -16841,7 +16843,7 @@ reference sensor color space.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -16907,7 +16909,7 @@ sensor colorspace to the CIE XYZ colorspace with a D50 whitepoint.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -16969,7 +16971,7 @@ sensor colorspace to the CIE XYZ colorspace with a D50 whitepoint.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -17074,7 +17076,7 @@ ISO=100</p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -17243,7 +17245,7 @@ Value &gt;= 1</p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -17298,7 +17300,7 @@ element.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -17821,7 +17823,7 @@ the time of capture.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -17883,7 +17885,7 @@ for each pixel.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -17946,7 +17948,7 @@ sample is required to be <code>(1,<wbr/> 1)</code>.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -17997,7 +17999,7 @@ The curve is interpolated using a cubic spline.<wbr/></p>
 
             <td class="entry_tags">
               <ul class="entry_tags">
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -18854,7 +18856,7 @@ generation</p>
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -19264,7 +19266,7 @@ map</p>
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -20299,7 +20301,7 @@ into this metadata field.<wbr/> See
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -20357,7 +20359,7 @@ The <code>(x,<wbr/> y)</code> coordinates must be bounded by
             <td class="entry_tags">
               <ul class="entry_tags">
                   <li><a href="#tag_V1">V1</a></li>
-                  <li><a href="#tag_DNG">DNG</a></li>
+                  <li><a href="#tag_RAW">RAW</a></li>
               </ul>
             </td>
 
@@ -22467,8 +22469,8 @@ to know when sensor settings have been applied.<wbr/></p>
           <li><a href="#dynamic_android.noiseReduction.mode">android.noiseReduction.mode</a> (dynamic)</li>
         </ul>
       </li> <!-- tag_V1 -->
-      <li id="tag_DNG">DNG - 
-        Needed for DNG file support
+      <li id="tag_RAW">RAW - 
+        Needed for useful RAW image processing and DNG file support
     
         <ul class="tags_entries">
           <li><a href="#controls_android.hotPixel.mode">android.hotPixel.mode</a> (controls)</li>
@@ -22497,7 +22499,7 @@ to know when sensor settings have been applied.<wbr/></p>
           <li><a href="#dynamic_android.statistics.hotPixelMap">android.statistics.hotPixelMap</a> (dynamic)</li>
           <li><a href="#dynamic_android.hotPixel.mode">android.hotPixel.mode</a> (dynamic)</li>
         </ul>
-      </li> <!-- tag_DNG -->
+      </li> <!-- tag_RAW -->
       <li id="tag_HAL2">HAL2 - 
         Entry is only used by camera device HAL 2.x
     

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 3867f7b..1ba6dd1 100644 (file)
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -24,8 +24,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
     <tag id="V1">
         New features for first camera 2 release (API1)
     </tag>
-    <tag id="DNG">
-        Needed for DNG file support
+    <tag id="RAW">
+        Needed for useful RAW image processing and DNG file support
     </tag>
     <tag id="HAL2">
         Entry is only used by camera device HAL 2.x
@@ -2477,7 +2477,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           are stuck at an arbitrary value).
           </details>
           <tag id="V1" />
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
       </controls>
       <static>
@@ -2500,13 +2500,13 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           pixels than actual pixels on the camera sensor.
           </hal_details>
           <tag id="V1" />
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
       </static>
       <dynamic>
         <clone entry="android.hotPixel.mode" kind="controls">
           <tag id="V1" />
-          <tag id="DNG" />
+          <tag id="RAW" />
         </clone>
       </dynamic>
     </section>
@@ -3635,10 +3635,14 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
               controls, but this capability only covers the above list of controls.
               </notes>
             </value>
-            <value optional="true">DNG
+            <value optional="true">RAW
               <notes>
-              The camera device supports outputting RAW buffers that can be
-              saved offline into a DNG format.
+              The camera device supports outputting RAW buffers and
+              metadata for interpreting them.
+
+              Devices supporting the RAW capability allow both for
+              saving DNG files, and for direct application processing of
+              raw sensor images.
 
               * RAW_SENSOR is supported as an output format.
               * The maximum available resolution for RAW_SENSOR streams
@@ -4155,9 +4159,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           :---------------|:-----------------|:----------
           RAW_OPAQUE      | JPEG             | ZSL
           RAW_OPAQUE      | YUV_420_888      | ZSL
-          RAW_OPAQUE      | RAW16            | DNG
-          RAW16           | YUV_420_888      | DNG
-          RAW16           | JPEG             | DNG
+          RAW_OPAQUE      | RAW16            | RAW
+          RAW16           | YUV_420_888      | RAW
+          RAW16           | JPEG             | RAW
 
           For ZSL-capable camera devices, using the RAW_OPAQUE format
           as either input or output will never hurt maximum frame rate (i.e.
@@ -4193,7 +4197,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
                   i += length;
               }
 
-              // writing (static example, DNG+ZSL)
+              // writing (static example, RAW+ZSL)
               int32_t[] contents = {
                 RAW_OPAQUE, 3, RAW16, YUV_420_888, BLOB,
                 RAW16, 2, YUV_420_888, BLOB,
@@ -4679,7 +4683,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             </range>
             <details>It is smaller or equal to
             sensor full pixel array, which could include the black calibration pixels.</details>
-            <tag id="DNG" />
+            <tag id="RAW" />
           </entry>
           <entry name="sensitivityRange" type="int32" visibility="public"
           type_notes="Range of supported sensitivities"
@@ -4714,7 +4718,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             <description>The arrangement of color filters on sensor;
             represents the colors in the top-left 2x2 section of
             the sensor, in reading order.</description>
-            <tag id="DNG" />
+            <tag id="RAW" />
           </entry>
           <entry name="exposureTimeRange" type="int64" visibility="public"
           type_notes="nanoseconds" container="array" typedef="rangeLong">
@@ -4806,7 +4810,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             If a size corresponding to pixelArraySize is listed, the resulting
             raw sensor image will include black pixels.
             </details>
-            <tag id="DNG" />
+            <tag id="RAW" />
             <tag id="BC" />
           </entry>
           <entry name="whiteLevel" type="int32" visibility="public">
@@ -4831,7 +4835,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             so the value for linear sensors should not be significantly lower
             than maximum raw value supported, i.e. 2^(sensor bits per pixel).
             </hal_details>
-            <tag id="DNG" />
+            <tag id="RAW" />
           </entry>
           <entry name="timestampCalibration" type="byte" visibility="public" enum="true">
             <enum>
@@ -4914,7 +4918,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </details>
           <hal_details>
           The first reference illuminant (android.sensor.referenceIlluminant1)
-          and corresponding matrices must be present to support DNG output.
+          and corresponding matrices must be present to support the RAW capability
+          and DNG output.
 
           When producing raw images with a color profile that has only been
           calibrated against a single light source, it is valid to omit
@@ -4934,7 +4939,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           temperature illuminant such as D65 will be chosen for the second
           reference illuminant.
           </hal_details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
         <entry name="referenceIlluminant2" type="byte" visibility="public">
           <description>
@@ -4952,7 +4957,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           android.sensor.calibrationTransform2, and
           android.sensor.forwardMatrix2 will also be present.
           </details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
         <entry name="calibrationTransform1" type="rational"
         visibility="public" optional="true"
@@ -4977,7 +4982,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           space under the first reference illuminant
           (android.sensor.referenceIlluminant1).
           </details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
         <entry name="calibrationTransform2" type="rational"
         visibility="public" optional="true"
@@ -5006,7 +5011,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           This matrix will only be present if the second reference
           illuminant is present.
           </details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
         <entry name="colorTransform1" type="rational"
         visibility="public" optional="true"
@@ -5036,7 +5041,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           match the standard white point for the first reference illuminant
           (i.e. no chromatic adaptation will be applied by this transform).
           </details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
         <entry name="colorTransform2" type="rational"
         visibility="public" optional="true"
@@ -5069,7 +5074,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           This matrix will only be present if the second reference
           illuminant is present.
           </details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
         <entry name="forwardMatrix1" type="rational"
         visibility="public" optional="true"
@@ -5097,7 +5102,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           illuminant in the reference sensor colorspace is mapped to D50 in the
           CIE XYZ colorspace.
           </details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
         <entry name="forwardMatrix2" type="rational"
         visibility="public" optional="true"
@@ -5128,7 +5133,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           This matrix will only be present if the second reference
           illuminant is present.
           </details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
         <entry name="baseGainFactor" type="rational"
         optional="true">
@@ -5161,7 +5166,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           The values are given in row-column scan order, with the first value
           corresponding to the element of the CFA in row=0, column=0.
           </hal_details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
         <entry name="maxAnalogSensitivity" type="int32" visibility="public"
         optional="true">
@@ -5207,7 +5212,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           dimensions given is hue, saturation, value; where hue is the 0th
           element.
           </details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
         <entry name="noiseProfile" type="double" visibility="public"
         optional="true" type_notes="Pairs of noise model coefficients"
@@ -5248,7 +5253,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           for the red channel, S1 and O1 are the coefficients for the first green
           channel, etc.
           </hal_details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
       </static>
       <dynamic>
@@ -5323,7 +5328,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
 
           The order of the values is R, G, B; where R is in the lowest index.
           </details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
         <entry name="profileHueSatMap" type="float"
         visibility="system" optional="true"
@@ -5355,7 +5360,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           inner loop. All zero input saturation entries are required to have a
           value scale factor of 1.0.
           </details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
         <entry name="profileToneCurve" type="float"
         visibility="system" optional="true"
@@ -5379,7 +5384,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           The curve is specified as a list of value pairs in linear gamma.
           The curve is interpolated using a cubic spline.
           </details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
         <entry name="greenSplit" type="float" visibility="public" optional="true">
           <description>
@@ -5428,7 +5433,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           set of images.  Other methods of calculation that produce equivalent
           results, and can be interpreted in the same manner, may be used.
           </hal_details>
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
       </dynamic>
       <controls>
@@ -5760,7 +5765,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           This must be set to a valid mode from android.statistics.info.availableHotPixelMapModes.
           </details>
           <tag id="V1" />
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
       </controls>
       <static>
@@ -5840,7 +5845,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             the ON and OFF options.
             </details>
             <tag id="V1" />
-            <tag id="DNG" />
+            <tag id="RAW" />
           </entry>
         </namespace>
       </static>
@@ -6194,7 +6199,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           pixels than actual pixels on the camera sensor.
           </hal_details>
           <tag id="V1" />
-          <tag id="DNG" />
+          <tag id="RAW" />
         </entry>
       </dynamic>
       <controls>

diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h
index 7a5329b..982888c 100644 (file)
--- a/camera/include/system/camera_metadata_tags.h
+++ b/camera/include/system/camera_metadata_tags.h
@@ -338,7 +338,7 @@ typedef enum camera_metadata_tag {
     ANDROID_STATISTICS_LENS_SHADING_MAP_MODE,         // enum         | public
     ANDROID_STATISTICS_END,
 
-    ANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES = 
+    ANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES =
                                                       // byte[]       | public
             ANDROID_STATISTICS_INFO_START,
     ANDROID_STATISTICS_INFO_HISTOGRAM_BUCKET_COUNT,   // int32        | system
@@ -660,7 +660,8 @@ typedef enum camera_metadata_enum_android_request_available_capabilities {
     ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BACKWARD_COMPATIBLE,
     ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR,
     ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING,
-    ANDROID_REQUEST_AVAILABLE_CAPABILITIES_DNG,
+    ANDROID_REQUEST_AVAILABLE_CAPABILITIES_DNG = 3, // temporary manual edit
+    ANDROID_REQUEST_AVAILABLE_CAPABILITIES_RAW = 3,
     ANDROID_REQUEST_AVAILABLE_CAPABILITIES_ZSL,
 } camera_metadata_enum_android_request_available_capabilities_t;
 
@@ -833,5 +834,3 @@ typedef enum camera_metadata_enum_android_sync_max_latency {
     ANDROID_SYNC_MAX_LATENCY_PER_FRAME_CONTROL                  = 0,
     ANDROID_SYNC_MAX_LATENCY_UNKNOWN                            = -1,
 } camera_metadata_enum_android_sync_max_latency_t;
-
-

diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c
index 2995539..d8c0f84 100644 (file)
--- a/camera/src/camera_metadata_tag_info.c
+++ b/camera/src/camera_metadata_tag_info.c
@@ -1637,8 +1637,8 @@ int camera_metadata_enum_snprint(uint32_t tag,
                     msg = "MANUAL_POST_PROCESSING";
                     ret = 0;
                     break;
-                case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_DNG:
-                    msg = "DNG";
+                case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_RAW:
+                    msg = "RAW";
                     ret = 0;
                     break;
                 case ANDROID_REQUEST_AVAILABLE_CAPABILITIES_ZSL: