camera_metadata: Update max stream num metadata tags

Change-Id: I9b37600a1e01c9af8bc8b2e3e26c08219cf45ff0

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 5b3cde2..306e920 100644 (file)
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -423,6 +423,7 @@
           <ul class="toc_section">
             <li><a href="#static_android.request.maxNumOutputStreams">android.request.maxNumOutputStreams</a></li>
             <li><a href="#static_android.request.maxNumReprocessStreams">android.request.maxNumReprocessStreams</a></li>
+            <li><a href="#static_android.request.maxNumInputStreams">android.request.maxNumInputStreams</a></li>
             <li><a href="#static_android.request.pipelineMaxDepth">android.request.pipelineMaxDepth</a></li>
             <li><a href="#static_android.request.partialResultCount">android.request.partialResultCount</a></li>
           </ul>
@@ -9164,19 +9165,17 @@ REPROCESS.<wbr/> For HAL3,<wbr/> this tag is redundant.<wbr/></p>
             </td> <!-- entry_type -->
 
             <td class="entry_description">
-              <p>How many output streams can be allocated at
-the same time for each type of stream</p>
+              <p>The maximum numbers of different types of output streams
+that can be configured and used simultaneously by a camera device.<wbr/></p>
             </td>
 
             <td class="entry_units">
-              The number of raw sensor streams; the number of
-          processed,<wbr/> uncompressed streams; and the number of
-          JPEG-compressed streams
             </td>
 
             <td class="entry_range">
-              <p>&gt;=1 for Raw and JPEG-compressed stream.<wbr/> &gt;= 3
-for processed,<wbr/> uncompressed streams</p>
+              <p>&gt;= 1 for JPEG-compressed format streams.<wbr/></p>
+<p>&gt;= 0 for Raw format streams.<wbr/></p>
+<p>&gt;= 3 for processed,<wbr/> uncompressed format streams.<wbr/></p>
             </td>
 
             <td class="entry_tags">
@@ -9191,9 +9190,21 @@ for processed,<wbr/> uncompressed streams</p>
           </tr>
           <tr class="entry_cont">
             <td class="entry_details" colspan="5">
-              <p>Video snapshot with preview callbacks requires 3
-processed streams (preview,<wbr/> record,<wbr/> app callbacks) and
-one JPEG stream (snapshot)</p>
+              <p>This is a 3 element tuple that contains the max number of output simultaneous
+streams for raw sensor,<wbr/> processed (and uncompressed),<wbr/> and JPEG formats respectively.<wbr/>
+For example,<wbr/> if max raw sensor format output stream number is 1,<wbr/> max YUV streams
+number is 3,<wbr/> and max JPEG stream number is 2,<wbr/> then this tuple should be <code>(1,<wbr/> 3,<wbr/> 2)</code>.<wbr/></p>
+<p>This lists the upper bound of the number of output streams supported by
+the camera device.<wbr/> Using more streams simultaneously may require more hardware and
+CPU resources that will consume more power.<wbr/> The image format for a output stream can
+be any supported format provided by <a href="#static_android.scaler.availableFormats">android.<wbr/>scaler.<wbr/>available<wbr/>Formats</a>.<wbr/> The formats
+defined in <a href="#static_android.scaler.availableFormats">android.<wbr/>scaler.<wbr/>available<wbr/>Formats</a> can be catergorized into the 3 stream types
+as below:</p>
+<ul>
+<li>JPEG-compressed format: BLOB.<wbr/></li>
+<li>Raw formats: RAW_<wbr/>SENSOR and RAW_<wbr/>OPAQUE.<wbr/></li>
+<li>processed,<wbr/> uncompressed formats: YCb<wbr/>Cr_<wbr/>420_<wbr/>888,<wbr/> YCr<wbr/>Cb_<wbr/>420_<wbr/>SP,<wbr/> YV12.<wbr/></li>
+</ul>
             </td>
           </tr>
 
@@ -9203,7 +9214,7 @@ one JPEG stream (snapshot)</p>
         
                 
           <tr class="entry" id="static_android.request.maxNumReprocessStreams">
-            <td class="entry_name" rowspan="1">
+            <td class="entry_name" rowspan="3">
               android.<wbr/>request.<wbr/>max<wbr/>Num<wbr/>Reprocess<wbr/>Streams
             </td>
             <td class="entry_type">
@@ -9220,20 +9231,81 @@ one JPEG stream (snapshot)</p>
 
             <td class="entry_description">
               <p>How many reprocessing streams of any type
-can be allocated at the same time</p>
+can be allocated at the same time.<wbr/></p>
             </td>
 
             <td class="entry_units">
             </td>
 
             <td class="entry_range">
-              <p>&gt;= 1</p>
+              <p>&gt;= 0</p>
+            </td>
+
+            <td class="entry_tags">
+              <ul class="entry_tags">
+                  <li><a href="#tag_HAL2">HAL2</a></li>
+              </ul>
+            </td>
+
+          </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <p><strong>Deprecated</strong>.<wbr/> Only used by HAL2.<wbr/>x.<wbr/></p>
+<p>When set to 0,<wbr/> it means no reprocess stream is supported.<wbr/></p>
+            </td>
+          </tr>
+
+
+          <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
+           <!-- end of entry -->
+        
+                
+          <tr class="entry" id="static_android.request.maxNumInputStreams">
+            <td class="entry_name" rowspan="3">
+              android.<wbr/>request.<wbr/>max<wbr/>Num<wbr/>Input<wbr/>Streams
+            </td>
+            <td class="entry_type">
+                <span class="entry_type_name">int32</span>
+
+              <span class="entry_type_visibility"> [public]</span>
+
+
+            </td> <!-- entry_type -->
+
+            <td class="entry_description">
+              <p>The maximum numbers of any type of input streams
+that can be configured and used simultaneously by a camera device.<wbr/></p>
+            </td>
+
+            <td class="entry_units">
+            </td>
+
+            <td class="entry_range">
+              <p>&gt;= 0 for LIMITED mode device (<code><a href="#static_android.info.supportedHardwareLevel">android.<wbr/>info.<wbr/>supported<wbr/>Hardware<wbr/>Level</a> == LIMITED</code>).<wbr/>
+&gt;= 1 for FULL mode device (<code><a href="#static_android.info.supportedHardwareLevel">android.<wbr/>info.<wbr/>supported<wbr/>Hardware<wbr/>Level</a> == FULL</code>).<wbr/></p>
             </td>
 
             <td class="entry_tags">
             </td>
 
           </tr>
+          <tr class="entries_header">
+            <th class="th_details" colspan="5">Details</th>
+          </tr>
+          <tr class="entry_cont">
+            <td class="entry_details" colspan="5">
+              <p>When set to 0,<wbr/> it means no input stream is supported.<wbr/></p>
+<p>The image format for a input stream can be any supported format provided
+by android.<wbr/>scaler.<wbr/>available<wbr/>Input<wbr/>Formats.<wbr/> When using an input stream,<wbr/> there must be
+at least one output stream configured to to receive the reprocessed images.<wbr/></p>
+<p>For example,<wbr/> for Zero Shutter Lag (ZSL) still capture use case,<wbr/> the input
+stream image format will be RAW_<wbr/>OPAQUE,<wbr/> the associated output stream image format
+should be JPEG.<wbr/></p>
+            </td>
+          </tr>
 
 
           <tr class="entry_spacer"><td class="entry_spacer" colspan="6"></td></tr>
@@ -15626,6 +15698,7 @@ to know when sensor settings have been applied.<wbr/></p>
           <li><a href="#controls_android.request.inputStreams">android.request.inputStreams</a> (controls)</li>
           <li><a href="#controls_android.request.outputStreams">android.request.outputStreams</a> (controls)</li>
           <li><a href="#controls_android.request.type">android.request.type</a> (controls)</li>
+          <li><a href="#static_android.request.maxNumReprocessStreams">android.request.maxNumReprocessStreams</a> (static)</li>
           <li><a href="#controls_android.blackLevel.lock">android.blackLevel.lock</a> (controls)</li>
         </ul>
       </li> <!-- tag_HAL2 -->

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index ffe8418..466570b 100644 (file)
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -2527,16 +2527,33 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           <array>
             <size>3</size>
           </array>
-          <description>How many output streams can be allocated at
-          the same time for each type of stream</description>
-          <units>The number of raw sensor streams; the number of
-          processed, uncompressed streams; and the number of
-          JPEG-compressed streams</units>
-          <range>&amp;gt;=1 for Raw and JPEG-compressed stream. &amp;gt;= 3
-          for processed, uncompressed streams</range>
-          <details>Video snapshot with preview callbacks requires 3
-          processed streams (preview, record, app callbacks) and
-          one JPEG stream (snapshot)</details>
+          <description>The maximum numbers of different types of output streams
+          that can be configured and used simultaneously by a camera device.
+          </description>
+          <range>
+          &amp;gt;= 1 for JPEG-compressed format streams.
+
+          &amp;gt;= 0 for Raw format streams.
+
+          &amp;gt;= 3 for processed, uncompressed format streams.
+          </range>
+          <details>
+          This is a 3 element tuple that contains the max number of output simultaneous
+          streams for raw sensor, processed (and uncompressed), and JPEG formats respectively.
+          For example, if max raw sensor format output stream number is 1, max YUV streams
+          number is 3, and max JPEG stream number is 2, then this tuple should be `(1, 3, 2)`.
+
+          This lists the upper bound of the number of output streams supported by
+          the camera device. Using more streams simultaneously may require more hardware and
+          CPU resources that will consume more power. The image format for a output stream can
+          be any supported format provided by android.scaler.availableFormats. The formats
+          defined in android.scaler.availableFormats can be catergorized into the 3 stream types
+          as below:
+
+          * JPEG-compressed format: BLOB.
+          * Raw formats: RAW_SENSOR and RAW_OPAQUE.
+          * processed, uncompressed formats: YCbCr_420_888, YCrCb_420_SP, YV12.
+          </details>
           <tag id="BC" />
         </entry>
         <entry name="maxNumReprocessStreams" type="int32" visibility="system"
@@ -2545,8 +2562,34 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             <size>1</size>
           </array>
           <description>How many reprocessing streams of any type
-          can be allocated at the same time</description>
-          <range>&amp;gt;= 1</range>
+          can be allocated at the same time.</description>
+          <range>&amp;gt;= 0</range>
+          <details>
+          **Deprecated**. Only used by HAL2.x.
+
+          When set to 0, it means no reprocess stream is supported.
+          </details>
+          <tag id="HAL2" />
+        </entry>
+        <entry name="maxNumInputStreams" type="int32" visibility="public">
+          <description>
+          The maximum numbers of any type of input streams
+          that can be configured and used simultaneously by a camera device.
+          </description>
+          <range>
+          &amp;gt;= 0 for LIMITED mode device (`android.info.supportedHardwareLevel == LIMITED`).
+          &amp;gt;= 1 for FULL mode device (`android.info.supportedHardwareLevel == FULL`).
+          </range>
+          <details>When set to 0, it means no input stream is supported.
+
+          The image format for a input stream can be any supported format provided
+          by android.scaler.availableInputFormats. When using an input stream, there must be
+          at least one output stream configured to to receive the reprocessed images.
+
+          For example, for Zero Shutter Lag (ZSL) still capture use case, the input
+          stream image format will be RAW_OPAQUE, the associated output stream image format
+          should be JPEG.
+          </details>
         </entry>
       </static>
       <dynamic>

diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h
index 5846270..14b61d5 100644 (file)
--- a/camera/include/system/camera_metadata_tags.h
+++ b/camera/include/system/camera_metadata_tags.h
@@ -248,6 +248,7 @@ typedef enum camera_metadata_tag {
     ANDROID_REQUEST_TYPE,                             // enum         | system
     ANDROID_REQUEST_MAX_NUM_OUTPUT_STREAMS,           // int32[]      | public
     ANDROID_REQUEST_MAX_NUM_REPROCESS_STREAMS,        // int32[]      | system
+    ANDROID_REQUEST_MAX_NUM_INPUT_STREAMS,            // int32        | public
     ANDROID_REQUEST_PIPELINE_DEPTH,                   // byte         | public
     ANDROID_REQUEST_PIPELINE_MAX_DEPTH,               // byte         | public
     ANDROID_REQUEST_PARTIAL_RESULT_COUNT,             // int32        | public

diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c
index 545da48..7e9d483 100644 (file)
--- a/camera/src/camera_metadata_tag_info.c
+++ b/camera/src/camera_metadata_tag_info.c
@@ -369,6 +369,8 @@ static tag_info_t android_request[ANDROID_REQUEST_END -
     { "maxNumOutputStreams",           TYPE_INT32  },
     [ ANDROID_REQUEST_MAX_NUM_REPROCESS_STREAMS - ANDROID_REQUEST_START ] =
     { "maxNumReprocessStreams",        TYPE_INT32  },
+    [ ANDROID_REQUEST_MAX_NUM_INPUT_STREAMS - ANDROID_REQUEST_START ] =
+    { "maxNumInputStreams",            TYPE_INT32  },
     [ ANDROID_REQUEST_PIPELINE_DEPTH - ANDROID_REQUEST_START ] =
     { "pipelineDepth",                 TYPE_BYTE   },
     [ ANDROID_REQUEST_PIPELINE_MAX_DEPTH - ANDROID_REQUEST_START ] =
@@ -1539,6 +1541,9 @@ int camera_metadata_enum_snprint(uint32_t tag,
         case ANDROID_REQUEST_MAX_NUM_REPROCESS_STREAMS: {
             break;
         }
+        case ANDROID_REQUEST_MAX_NUM_INPUT_STREAMS: {
+            break;
+        }
         case ANDROID_REQUEST_PIPELINE_DEPTH: {
             break;
         }