commit c6c3e1e09e10eb701c8bd70d633f123ca48a5d2f
author Shuzhen Wang <shuzhenwang@google.com> Wed Mar 19 10:34:53 2025 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 19 10:34:53 2025 -0700
tree 40a2fadaec44745ae5c1ffd8d99b75fe0e373371
parent 6b81ee6f2854d7525cfeefdd5ee5091d5edec870
parent d34ad4a7550e03134d8c20040fdd0a752b6f8b65

Merge "Camera: Update doc on required feature combination query" into main

camera/docs/docs.html

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index ef07093..da4abac 100644
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -37756,12 +37756,6 @@
 </tr>
 <tr>
 <td style="text-align: center;">PRIV</td>
-<td style="text-align: center;">S1080P</td>
-<td style="text-align: center;">PRIV</td>
-<td style="text-align: center;">UHD</td>
-</tr>
-<tr>
-<td style="text-align: center;">PRIV</td>
 <td style="text-align: center;">S720P</td>
 <td style="text-align: center;">JPEG/<wbr/>JPEG_<wbr/>R</td>
 <td style="text-align: center;">MAXIMUM_<wbr/>16_<wbr/>9</td>
@@ -37829,28 +37823,36 @@
 </thead>
 <tbody>
 <tr>
-<td style="text-align: center;">PRIV</td>
+<td style="text-align: center;">PRIV Preview</td>
 <td style="text-align: center;">S1080P</td>
-<td style="text-align: center;">PRIV</td>
+<td style="text-align: center;">PRIV Video</td>
 <td style="text-align: center;">S1080P</td>
 <td style="text-align: center;"></td>
 <td style="text-align: center;"></td>
 </tr>
 <tr>
-<td style="text-align: center;">PRIV</td>
+<td style="text-align: center;">PRIV Preview</td>
 <td style="text-align: center;">S1080P</td>
-<td style="text-align: center;">PRIV</td>
+<td style="text-align: center;">PRIV Video</td>
 <td style="text-align: center;">S1440P</td>
 <td style="text-align: center;"></td>
 <td style="text-align: center;"></td>
 </tr>
 <tr>
-<td style="text-align: center;">PRIV</td>
+<td style="text-align: center;">PRIV Preview</td>
 <td style="text-align: center;">S1080P</td>
-<td style="text-align: center;">YUV</td>
+<td style="text-align: center;">PRIV Video</td>
+<td style="text-align: center;">UHD</td>
+<td style="text-align: center;"></td>
+<td style="text-align: center;"></td>
+</tr>
+<tr>
+<td style="text-align: center;">PRIV Preview</td>
 <td style="text-align: center;">S1080P</td>
+<td style="text-align: center;">YUV Analysis</td>
 <td style="text-align: center;">S1080P</td>
-<td style="text-align: center;">PRIV</td>
+<td style="text-align: center;">PRIV Video</td>
+<td style="text-align: center;">1080P</td>
 </tr>
 </tbody>
 </table>

camera/docs/metadata_definitions.xml

diff --git a/camera/docs/metadata_definitions.xml b/camera/docs/metadata_definitions.xml
index 2caa33b..b85ee2f 100644
--- a/camera/docs/metadata_definitions.xml
+++ b/camera/docs/metadata_definitions.xml
@@ -13345,7 +13345,6 @@
               PRIV        | S1080P        | JPEG/JPEG_R     | UHD          |
               PRIV        | S1080P        | JPEG/JPEG_R     | S1440P       |
               PRIV        | S1080P        | JPEG/JPEG_R     | S1080P       |
-              PRIV        | S1080P        | PRIV            | UHD          |
               PRIV        | S720P         | JPEG/JPEG_R     | MAXIMUM_16_9 |
               PRIV        | S720P         | JPEG/JPEG_R     | UHD          |
               PRIV        | S720P         | JPEG/JPEG_R     | S1080P       |
@@ -13371,11 +13370,12 @@
           When set to BAKLAVA, the additional stream combinations below are verified
           by the compliance tests:
 
-          Target 1    |     Size      | Target 2        |     Size     | Target 3   |    Size     |
-          :----------:|:-------------:|:---------------:|:------------:|:----------:|:-----------:|
-          PRIV        | S1080P        | PRIV            | S1080P       |            |             |
-          PRIV        | S1080P        | PRIV            | S1440P       |            |             |
-          PRIV        | S1080P        | YUV             | S1080P       | S1080P     | PRIV        |
+          Target 1     |     Size      | Target 2        |     Size     | Target 3   |    Size     |
+          :-----------:|:-------------:|:---------------:|:------------:|:----------:|:-----------:|
+          PRIV Preview | S1080P        | PRIV Video      | S1080P       |            |             |
+          PRIV Preview | S1080P        | PRIV Video      | S1440P       |            |             |
+          PRIV Preview | S1080P        | PRIV Video      | UHD          |            |             |
+          PRIV Preview | S1080P        | YUV Analysis    | S1080P       | PRIV Video | 1080P       |
 
           * VIDEO_STABILIZATION_MODE: {OFF, ON} for the newly added stream combinations given the
           presence of dedicated video stream