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

Commit 9b25d050 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Wide screen camera profile for 16/9e devices (480x854)" into gingerbread

parents b44a0d6e f0aa982c

api/current.xml

+11 −0
Original line number Original line Diff line number Diff line
@@ -86070,6 +86070,17 @@ 
 visibility="public"

 visibility="public"

>

>

</field>

</field>

<field name="QUALITY_WIDE"

 type="int"

 transient="false"

 volatile="false"

 value="3"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="audioBitRate"

<field name="audioBitRate"

 type="int"

 type="int"

 transient="false"

 transient="false"

include/media/MediaProfiles.h

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

enum camcorder_quality {

    CAMCORDER_QUALITY_LOW  = 0,

    CAMCORDER_QUALITY_LOW  = 0,

    CAMCORDER_QUALITY_HIGH = 1,

    CAMCORDER_QUALITY_HIGH = 1,

    CAMCORDER_QUALITY_HD = 2

    CAMCORDER_QUALITY_HD = 2,

    CAMCORDER_QUALITY_WIDE = 3

};

};





enum video_decoder {

enum video_decoder {

media/java/android/media/CamcorderProfile.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -57,6 +57,7 @@ public class CamcorderProfile 
    public static final int QUALITY_LOW  = 0;

    public static final int QUALITY_LOW  = 0;

    public static final int QUALITY_HIGH = 1;

    public static final int QUALITY_HIGH = 1;

    public static final int QUALITY_HD   = 2;

    public static final int QUALITY_HD   = 2;

    public static final int QUALITY_WIDE = 3;





    /**

    /**

     * Default recording duration in seconds before the session is terminated.

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

     * @param quality the target quality level for the camcorder profile

     */

     */

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

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

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

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

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

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

            throw new IllegalArgumentException(errMessage);

            throw new IllegalArgumentException(errMessage);

        }

        }

media/jni/android_media_MediaProfiles.cpp

+1 −1
Original line number Original line 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)

android_media_MediaProfiles_native_get_camcorder_profile(JNIEnv *env, jobject thiz, jint id, jint quality)

{

{

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

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

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

    if (quality < CAMCORDER_QUALITY_LOW || quality > CAMCORDER_QUALITY_WIDE) {

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

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

        return NULL;

        return NULL;

    }

    }

media/libmedia/MediaProfiles.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,8 @@ const MediaProfiles::NameToTagMap MediaProfiles::sAudioDecoderNameMap[] = { 
const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = {

const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = {

    {"high", CAMCORDER_QUALITY_HIGH},

    {"high", CAMCORDER_QUALITY_HIGH},

    {"low",  CAMCORDER_QUALITY_LOW},

    {"low",  CAMCORDER_QUALITY_LOW},

    {"hd",   CAMCORDER_QUALITY_HD}

    {"hd",   CAMCORDER_QUALITY_HD},

    {"wide", CAMCORDER_QUALITY_WIDE}

};

};





/*static*/ void

/*static*/ void