Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f1e69c7 authored by Wu-cheng Li's avatar Wu-cheng Li
Browse files

Unhide camera fps range API and deprecate old ones. 

Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.

Change-Id: I1233a22ed64d42f167432085716bb6bfc3d36bbf
parent ee4831c4

api/current.xml

+66 −5
Original line number Diff line number Diff line
@@ -76089,6 +76089,19 @@ 
 visibility="public"

>

</method>

<method name="getPreviewFpsRange"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="range" type="int[]">

</parameter>

</method>

<method name="getPreviewFrameRate"

 return="int"

 abstract="false"
@@ -76096,7 +76109,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -76221,6 +76234,17 @@ 
 visibility="public"

>

</method>

<method name="getSupportedPreviewFpsRange"

 return="java.util.List&lt;int[]&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getSupportedPreviewFrameRates"

 return="java.util.List&lt;java.lang.Integer&gt;"

 abstract="false"
@@ -76228,7 +76252,7 @@ 
 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 deprecated="deprecated"

 visibility="public"

>

</method>
@@ -76610,7 +76634,7 @@ 
<parameter name="pixel_format" type="int">

</parameter>

</method>

<method name="setPreviewFrameRate"

<method name="setPreviewFpsRange"

 return="void"

 abstract="false"

 native="false"
@@ -76620,6 +76644,21 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="min" type="int">

</parameter>

<parameter name="max" type="int">

</parameter>

</method>

<method name="setPreviewFrameRate"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="deprecated"

 visibility="public"

>

<parameter name="fps" type="int">

</parameter>

</method>
@@ -77033,6 +77072,28 @@ 
 visibility="public"

>

</field>

<field name="PREVIEW_FPS_MAX_INDEX"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="PREVIEW_FPS_MIN_INDEX"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="SCENE_MODE_ACTION"

 type="java.lang.String"

 transient="false"
@@ -78424,7 +78485,7 @@ 
 type="float"

 transient="false"

 volatile="false"

 value="0.001f"

 value="0.0010f"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -224842,7 +224903,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="arg0" type="T">

<parameter name="t" type="T">

</parameter>

</method>

</interface>

core/java/android/hardware/Camera.java

+7 −6
Original line number Diff line number Diff line
@@ -1224,7 +1224,6 @@ public class Camera { 
         * The array index of minimum preview fps for use with {@link

         * #getPreviewFpsRange(int[])} or {@link

         * #getSupportedPreviewFpsRange()}.

         * @hide

         */

        public static final int PREVIEW_FPS_MIN_INDEX = 0;
@@ -1232,7 +1231,6 @@ public class Camera { 
         * The array index of maximum preview fps for use with {@link

         * #getPreviewFpsRange(int[])} or {@link

         * #getSupportedPreviewFpsRange()}.

         * @hide

         */

        public static final int PREVIEW_FPS_MAX_INDEX = 1;
@@ -1471,7 +1469,9 @@ public class Camera { 
         * target frame rate. The actual frame rate depends on the driver.

         *

         * @param fps the frame rate (frames per second)

         * @deprecated replaced by {@link #setPreviewFpsRange(int,int)}

         */

        @Deprecated

        public void setPreviewFrameRate(int fps) {

            set(KEY_PREVIEW_FRAME_RATE, fps);

        }
@@ -1482,7 +1482,9 @@ public class Camera { 
         * depends on the driver.

         *

         * @return the frame rate setting (frames per second)

         * @deprecated replaced by {@link #getPreviewFpsRange(int[])}

         */

        @Deprecated

        public int getPreviewFrameRate() {

            return getInt(KEY_PREVIEW_FRAME_RATE);

        }
@@ -1492,7 +1494,9 @@ public class Camera { 
         *

         * @return a list of supported preview frame rates. null if preview

         *         frame rate setting is not supported.

         * @deprecated replaced by {@link #getSupportedPreviewFpsRange()}

         */

        @Deprecated

        public List<Integer> getSupportedPreviewFrameRates() {

            String str = get(KEY_PREVIEW_FRAME_RATE + SUPPORTED_VALUES_SUFFIX);

            return splitInt(str);
@@ -1509,7 +1513,6 @@ public class Camera { 
         * @throws RuntimeException if fps range is invalid.

         * @see #setPreviewCallbackWithBuffer(Camera.PreviewCallback)

         * @see #getSupportedPreviewFpsRange()

         * @hide

         */

        public void setPreviewFpsRange(int min, int max) {

            set(KEY_PREVIEW_FPS_RANGE, "" + min + "," + max);
@@ -1523,12 +1526,11 @@ public class Camera { 
         * @see #PREVIEW_FPS_MIN_INDEX

         * @see #PREVIEW_FPS_MAX_INDEX

         * @see #getSupportedPreviewFpsRange()

         * @hide

         */

        public void getPreviewFpsRange(int[] range) {

            if (range == null || range.length != 2) {

                throw new IllegalArgumentException(

                        "range must be an float array with two elements.");

                        "range must be an array with two elements.");

            }

            splitInt(get(KEY_PREVIEW_FPS_RANGE), range);

        }
@@ -1549,7 +1551,6 @@ public class Camera { 
         *         minimum fps).

         * @see #PREVIEW_FPS_MIN_INDEX

         * @see #PREVIEW_FPS_MAX_INDEX

         * @hide

         */

        public List<int[]> getSupportedPreviewFpsRange() {

            String str = get(KEY_PREVIEW_FPS_RANGE + SUPPORTED_VALUES_SUFFIX);