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

Commit 0128a783 authored by Steve Kondik's avatar Steve Kondik
Browse files

media: Add HD media profile, unhide EncoderCapabilities 

Change-Id: Ib72bc4d5acb8f63064b9fc00614cfeb07913436c
parent c33c196b

api/current.xml

+232 −1
Original line number Diff line number Diff line
@@ -76171,7 +76171,7 @@ 
 type="float"

 transient="false"

 volatile="false"

 value="0.0010f"

 value="0.001f"

 static="true"

 final="true"

 deprecated="not deprecated"
@@ -84827,6 +84827,17 @@ 
<parameter name="quality" type="int">

</parameter>

</method>

<field name="QUALITY_HD"

 type="int"

 transient="false"

 volatile="false"

 value="2"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="QUALITY_HIGH"

 type="int"

 transient="false"
@@ -85048,6 +85059,226 @@ 
>

</field>

</class>

<class name="EncoderCapabilities"

 extends="java.lang.Object"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="getAudioEncoders"

 return="java.util.List&lt;android.media.EncoderCapabilities.AudioEncoderCap&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getOutputFileFormats"

 return="int[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getVideoEncoders"

 return="java.util.List&lt;android.media.EncoderCapabilities.VideoEncoderCap&gt;"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</class>

<class name="EncoderCapabilities.AudioEncoderCap"

 extends="java.lang.Object"

 abstract="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<field name="mCodec"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMaxBitRate"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMaxChannels"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMaxSampleRate"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMinBitRate"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMinChannels"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMinSampleRate"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="EncoderCapabilities.VideoEncoderCap"

 extends="java.lang.Object"

 abstract="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<field name="mCodec"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMaxBitRate"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMaxFrameHeight"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMaxFrameRate"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMaxFrameWidth"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMinBitRate"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMinFrameHeight"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMinFrameRate"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="mMinFrameWidth"

 type="int"

 transient="false"

 volatile="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

</class>

<class name="ExifInterface"

 extends="java.lang.Object"

 abstract="false"

include/media/MediaProfiles.h

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ namespace android { 


enum camcorder_quality {

    CAMCORDER_QUALITY_LOW  = 0,

    CAMCORDER_QUALITY_HIGH = 1

    CAMCORDER_QUALITY_HIGH = 1,

    CAMCORDER_QUALITY_HD = 2

};



enum video_decoder {

media/java/android/media/CamcorderProfile.java

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ public class CamcorderProfile 
     */

    public static final int QUALITY_LOW  = 0;

    public static final int QUALITY_HIGH = 1;

    public static final int QUALITY_HD   = 2;



    /**

     * Default recording duration in seconds before the session is terminated.
@@ -146,7 +147,7 @@ public class CamcorderProfile 
     * @param quality the target quality level for the camcorder profile

     */

    public static CamcorderProfile get(int cameraId, int quality) {

        if (quality < QUALITY_LOW || quality > QUALITY_HIGH) {

        if (quality < QUALITY_LOW || quality > QUALITY_HD) {

            String errMessage = "Unsupported quality level: " + quality;

            throw new IllegalArgumentException(errMessage);

        }

media/java/android/media/EncoderCapabilities.java

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.util.Log; 
 * The EncoderCapabilities class is used to retrieve the

 * capabilities for different video and audio

 * encoders supported on a specific Android platform.

 * {@hide}

 */

public class EncoderCapabilities

{

media/jni/android_media_MediaProfiles.cpp

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ static jobject 
android_media_MediaProfiles_native_get_camcorder_profile(JNIEnv *env, jobject thiz, jint id, jint quality)

{

    LOGV("native_get_camcorder_profile: %d %d", id, quality);

    if (quality != CAMCORDER_QUALITY_HIGH && quality != CAMCORDER_QUALITY_LOW) {

    if (quality != CAMCORDER_QUALITY_HIGH && quality != CAMCORDER_QUALITY_LOW && quality != CAMCORDER_QUALITY_HD) {

        jniThrowException(env, "java/lang/RuntimeException", "Unknown camcorder profile quality");

        return NULL;

    }