diff options
author | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:33:12 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-03-10 18:33:12 -0800 |
commit | 92d65f3fd2fdf37b3593ba60a50cd5f551e7f238 (patch) | |
tree | 93ebc4c3199e5208737d266ce8acf1475b250792 | |
parent | c969dad6892b673a37bb052bbf2d5158d8693ff8 (diff) | |
parent | 137dfd45dfed5ba7176bfd6688b1ca3c447482db (diff) | |
download | android_system_media-92d65f3fd2fdf37b3593ba60a50cd5f551e7f238.tar.gz android_system_media-92d65f3fd2fdf37b3593ba60a50cd5f551e7f238.tar.bz2 android_system_media-92d65f3fd2fdf37b3593ba60a50cd5f551e7f238.zip |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/system/media into cm-13.0staging/cm-13.0+r22
Android 6.0.1 release 22
-rw-r--r-- | camera/docs/docs.html | 19 | ||||
-rw-r--r-- | camera/docs/metadata_properties.xml | 14 |
2 files changed, 22 insertions, 11 deletions
diff --git a/camera/docs/docs.html b/camera/docs/docs.html index 18e074b1..68fac793 100644 --- a/camera/docs/docs.html +++ b/camera/docs/docs.html @@ -4325,17 +4325,24 @@ this camera device.<wbr/></p> <td class="entry_details" colspan="5"> <p>For devices at the LEGACY level or above:</p> <ul> -<li>This list will always include (30,<wbr/> 30).<wbr/></li> -<li>Also,<wbr/> for constant-framerate recording,<wbr/> for each normal +<li> +<p>For constant-framerate recording,<wbr/> for each normal +<a href="https://developer.android.com/reference/android/media/CamcorderProfile.html">CamcorderProfile</a>,<wbr/> that is,<wbr/> a <a href="https://developer.android.com/reference/android/media/CamcorderProfile.html">CamcorderProfile</a> that has <a href="https://developer.android.com/reference/android/media/CamcorderProfile.html#quality">quality</a> in the range [<a href="https://developer.android.com/reference/android/media/CamcorderProfile.html#QUALITY_LOW">QUALITY_<wbr/>LOW</a>,<wbr/> <a href="https://developer.android.com/reference/android/media/CamcorderProfile.html#QUALITY_2160P">QUALITY_<wbr/>2160P</a>],<wbr/> if the profile is supported by the device and has <a href="https://developer.android.com/reference/android/media/CamcorderProfile.html#videoFrameRate">videoFrameRate</a> <code>x</code>,<wbr/> this list will -always include (<code>x</code>,<wbr/><code>x</code>).<wbr/></li> -<li>For preview streaming use case,<wbr/> this list will always include (<code>min</code>,<wbr/> <code>max</code>) where -<code>min</code> <= 15 and <code>max</code> >= 30.<wbr/></li> +always include (<code>x</code>,<wbr/><code>x</code>).<wbr/></p> +</li> +<li> +<p>Also,<wbr/> a camera device must either not support any +<a href="https://developer.android.com/reference/android/media/CamcorderProfile.html">CamcorderProfile</a>,<wbr/> +or support at least one +normal <a href="https://developer.android.com/reference/android/media/CamcorderProfile.html">CamcorderProfile</a> that has +<a href="https://developer.android.com/reference/android/media/CamcorderProfile.html#videoFrameRate">videoFrameRate</a> <code>x</code> >= 24.<wbr/></p> +</li> </ul> <p>For devices at the LIMITED level or above:</p> <ul> @@ -15307,7 +15314,7 @@ raw sensor images.<wbr/></p> <li>The maximum available resolution for RAW_<wbr/>SENSOR streams will match either the value in <a href="#static_android.sensor.info.pixelArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>pixel<wbr/>Array<wbr/>Size</a> or - <a href="#static_android.sensor.info.activeArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>active<wbr/>Array<wbr/>Size</a>.<wbr/></li> + <a href="#static_android.sensor.info.preCorrectionActiveArraySize">android.<wbr/>sensor.<wbr/>info.<wbr/>pre<wbr/>Correction<wbr/>Active<wbr/>Array<wbr/>Size</a>.<wbr/></li> <li>All DNG-related optional metadata entries are provided by the camera device.<wbr/></li> </ul></span> diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml index aac0acfc..b10a7932 100644 --- a/camera/docs/metadata_properties.xml +++ b/camera/docs/metadata_properties.xml @@ -1885,8 +1885,8 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata <details> For devices at the LEGACY level or above: - * This list will always include (30, 30). - * Also, for constant-framerate recording, for each normal + * For constant-framerate recording, for each normal + {@link android.media.CamcorderProfile CamcorderProfile}, that is, a {@link android.media.CamcorderProfile CamcorderProfile} that has {@link android.media.CamcorderProfile#quality quality} in the range [{@link android.media.CamcorderProfile#QUALITY_LOW QUALITY_LOW}, @@ -1894,8 +1894,12 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata supported by the device and has {@link android.media.CamcorderProfile#videoFrameRate videoFrameRate} `x`, this list will always include (`x`,`x`). - * For preview streaming use case, this list will always include (`min`, `max`) where - `min` <= 15 and `max` >= 30. + + * Also, a camera device must either not support any + {@link android.media.CamcorderProfile CamcorderProfile}, + or support at least one + normal {@link android.media.CamcorderProfile CamcorderProfile} that has + {@link android.media.CamcorderProfile#videoFrameRate videoFrameRate} `x` >= 24. For devices at the LIMITED level or above: @@ -4567,7 +4571,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata * The maximum available resolution for RAW_SENSOR streams will match either the value in android.sensor.info.pixelArraySize or - android.sensor.info.activeArraySize. + android.sensor.info.preCorrectionActiveArraySize. * All DNG-related optional metadata entries are provided by the camera device. </notes> |