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

Commit 12bbe5d7 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom 

* commit '92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0':
  Add QVGA resolution to CamcorderProfile
parents 89aa8fe4 669012d7

include/media/MediaProfiles.h

+4 −2
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ enum camcorder_quality { 
    CAMCORDER_QUALITY_480P = 4,

    CAMCORDER_QUALITY_720P = 5,

    CAMCORDER_QUALITY_1080P = 6,

    CAMCORDER_QUALITY_LIST_END = 6,

    CAMCORDER_QUALITY_QVGA = 7,

    CAMCORDER_QUALITY_LIST_END = 7,



    CAMCORDER_QUALITY_TIME_LAPSE_LIST_START = 1000,

    CAMCORDER_QUALITY_TIME_LAPSE_LOW  = 1000,
@@ -42,7 +43,8 @@ enum camcorder_quality { 
    CAMCORDER_QUALITY_TIME_LAPSE_480P = 1004,

    CAMCORDER_QUALITY_TIME_LAPSE_720P = 1005,

    CAMCORDER_QUALITY_TIME_LAPSE_1080P = 1006,

    CAMCORDER_QUALITY_TIME_LAPSE_LIST_END = 1006,

    CAMCORDER_QUALITY_TIME_LAPSE_QVGA = 1007,

    CAMCORDER_QUALITY_TIME_LAPSE_LIST_END = 1007,

};



/**

media/libmedia/MediaProfiles.cpp

+4 −2
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = { 
    {"480p", CAMCORDER_QUALITY_480P},

    {"720p", CAMCORDER_QUALITY_720P},

    {"1080p", CAMCORDER_QUALITY_1080P},

    {"qvga", CAMCORDER_QUALITY_QVGA},



    {"timelapselow",  CAMCORDER_QUALITY_TIME_LAPSE_LOW},

    {"timelapsehigh", CAMCORDER_QUALITY_TIME_LAPSE_HIGH},
@@ -74,7 +75,8 @@ const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = { 
    {"timelapsecif", CAMCORDER_QUALITY_TIME_LAPSE_CIF},

    {"timelapse480p", CAMCORDER_QUALITY_TIME_LAPSE_480P},

    {"timelapse720p", CAMCORDER_QUALITY_TIME_LAPSE_720P},

    {"timelapse1080p", CAMCORDER_QUALITY_TIME_LAPSE_1080P}

    {"timelapse1080p", CAMCORDER_QUALITY_TIME_LAPSE_1080P},

    {"timelapseqvga", CAMCORDER_QUALITY_TIME_LAPSE_QVGA},

};



/*static*/ void
@@ -1139,7 +1141,7 @@ int MediaProfiles::getStartTimeOffsetMs(int cameraId) const { 
    if (index >= 0) {

        offsetTimeMs = mStartTimeOffsets.valueFor(cameraId);

    }

    LOGV("%s: offsetTime=%d ms and cameraId=%d", offsetTimeMs, cameraId);

    LOGV("offsetTime=%d ms and cameraId=%d", offsetTimeMs, cameraId);

    return offsetTimeMs;

}