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

Commit ab964f9f authored by Hangyu Kuang's avatar Hangyu Kuang Committed by Android (Google) Code Review
Browse files

Merge "CamcorderProfiles: Add new camcorder profiles"

parents b9b9b069 b5bfa0e2

media/libmedia/MediaProfiles.cpp

+13 −0
Original line number Diff line number Diff line
@@ -92,6 +92,19 @@ const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = { 
    {"highspeed720p", CAMCORDER_QUALITY_HIGH_SPEED_720P},

    {"highspeed1080p", CAMCORDER_QUALITY_HIGH_SPEED_1080P},

    {"highspeed2160p", CAMCORDER_QUALITY_HIGH_SPEED_2160P},



    // Vendor-specific profiles

    {"vga", CAMCORDER_QUALITY_VGA},

    {"4kdci", CAMCORDER_QUALITY_4KDCI},

    {"timelapsevga", CAMCORDER_QUALITY_TIME_LAPSE_VGA},

    {"timelapse4kdci", CAMCORDER_QUALITY_TIME_LAPSE_4KDCI},

    {"highspeedcif", CAMCORDER_QUALITY_HIGH_SPEED_CIF},

    {"highspeedvga", CAMCORDER_QUALITY_HIGH_SPEED_VGA},

    {"highspeed4kdci", CAMCORDER_QUALITY_HIGH_SPEED_4KDCI},

    {"qhd", CAMCORDER_QUALITY_QHD},

    {"2k", CAMCORDER_QUALITY_2k},

    {"timelapseqhd", CAMCORDER_QUALITY_TIME_LAPSE_QHD},

    {"timelapse2k", CAMCORDER_QUALITY_TIME_LAPSE_2k},

};



#if LOG_NDEBUG

media/libmedia/include/media/MediaProfiles.h

+14 −3
Original line number Diff line number Diff line
@@ -34,7 +34,11 @@ enum camcorder_quality { 
    CAMCORDER_QUALITY_1080P = 6,

    CAMCORDER_QUALITY_QVGA = 7,

    CAMCORDER_QUALITY_2160P = 8,

    CAMCORDER_QUALITY_LIST_END = 8,

    CAMCORDER_QUALITY_VGA = 9,

    CAMCORDER_QUALITY_4KDCI = 10,

    CAMCORDER_QUALITY_QHD = 11,

    CAMCORDER_QUALITY_2k = 12,

    CAMCORDER_QUALITY_LIST_END = 12,



    CAMCORDER_QUALITY_TIME_LAPSE_LIST_START = 1000,

    CAMCORDER_QUALITY_TIME_LAPSE_LOW  = 1000,
@@ -46,7 +50,11 @@ enum camcorder_quality { 
    CAMCORDER_QUALITY_TIME_LAPSE_1080P = 1006,

    CAMCORDER_QUALITY_TIME_LAPSE_QVGA = 1007,

    CAMCORDER_QUALITY_TIME_LAPSE_2160P = 1008,

    CAMCORDER_QUALITY_TIME_LAPSE_LIST_END = 1008,

    CAMCORDER_QUALITY_TIME_LAPSE_VGA = 1009,

    CAMCORDER_QUALITY_TIME_LAPSE_4KDCI = 1010,

    CAMCORDER_QUALITY_TIME_LAPSE_QHD = 1011,

    CAMCORDER_QUALITY_TIME_LAPSE_2k = 1012,

    CAMCORDER_QUALITY_TIME_LAPSE_LIST_END = 1012,



    CAMCORDER_QUALITY_HIGH_SPEED_LIST_START = 2000,

    CAMCORDER_QUALITY_HIGH_SPEED_LOW  = 2000,
@@ -55,7 +63,10 @@ enum camcorder_quality { 
    CAMCORDER_QUALITY_HIGH_SPEED_720P = 2003,

    CAMCORDER_QUALITY_HIGH_SPEED_1080P = 2004,

    CAMCORDER_QUALITY_HIGH_SPEED_2160P = 2005,

    CAMCORDER_QUALITY_HIGH_SPEED_LIST_END = 2005,

    CAMCORDER_QUALITY_HIGH_SPEED_CIF = 2006,

    CAMCORDER_QUALITY_HIGH_SPEED_VGA = 2007,

    CAMCORDER_QUALITY_HIGH_SPEED_4KDCI = 2008,

    CAMCORDER_QUALITY_HIGH_SPEED_LIST_END = 2008,

};



enum video_decoder {