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

Commit f543afb2 authored by Lajos Molnar's avatar Lajos Molnar Committed by Android (Google) Code Review
Browse files

Merge "media: Add 8K UHD CamcorderProfile quality" into sc-dev

parents 89b4f6ad 5e35f77b

media/libmedia/MediaProfiles.cpp

+11 −10
Original line number Diff line number Diff line
@@ -121,6 +121,11 @@ const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = { 
    {"1080p", CAMCORDER_QUALITY_1080P},

    {"2160p", CAMCORDER_QUALITY_2160P},

    {"qvga", CAMCORDER_QUALITY_QVGA},

    {"vga", CAMCORDER_QUALITY_VGA},

    {"4kdci", CAMCORDER_QUALITY_4KDCI},

    {"qhd", CAMCORDER_QUALITY_QHD},

    {"2k", CAMCORDER_QUALITY_2K},

    {"8kuhd", CAMCORDER_QUALITY_8KUHD},



    {"timelapselow",  CAMCORDER_QUALITY_TIME_LAPSE_LOW},

    {"timelapsehigh", CAMCORDER_QUALITY_TIME_LAPSE_HIGH},
@@ -131,6 +136,10 @@ const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = { 
    {"timelapse1080p", CAMCORDER_QUALITY_TIME_LAPSE_1080P},

    {"timelapse2160p", CAMCORDER_QUALITY_TIME_LAPSE_2160P},

    {"timelapseqvga", CAMCORDER_QUALITY_TIME_LAPSE_QVGA},

    {"timelapsevga", CAMCORDER_QUALITY_TIME_LAPSE_VGA},

    {"timelapse4kdci", CAMCORDER_QUALITY_TIME_LAPSE_4KDCI},

    {"timelapseqhd", CAMCORDER_QUALITY_TIME_LAPSE_QHD},

    {"timelapse2k", CAMCORDER_QUALITY_TIME_LAPSE_2K},



    {"highspeedlow",  CAMCORDER_QUALITY_HIGH_SPEED_LOW},

    {"highspeedhigh", CAMCORDER_QUALITY_HIGH_SPEED_HIGH},
@@ -138,19 +147,11 @@ 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},



    // Vendor-specific profiles

};



#if LOG_NDEBUG

media/libmedia/include/media/MediaProfiles.h

+6 −4
Original line number Diff line number Diff line
@@ -37,8 +37,9 @@ enum camcorder_quality { 
    CAMCORDER_QUALITY_VGA = 9,

    CAMCORDER_QUALITY_4KDCI = 10,

    CAMCORDER_QUALITY_QHD = 11,

    CAMCORDER_QUALITY_2k = 12,

    CAMCORDER_QUALITY_LIST_END = 12,

    CAMCORDER_QUALITY_2K = 12,

    CAMCORDER_QUALITY_8KUHD = 13,

    CAMCORDER_QUALITY_LIST_END = 13,



    CAMCORDER_QUALITY_TIME_LAPSE_LIST_START = 1000,

    CAMCORDER_QUALITY_TIME_LAPSE_LOW  = 1000,
@@ -53,8 +54,9 @@ enum camcorder_quality { 
    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_TIME_LAPSE_2K = 1012,

    CAMCORDER_QUALITY_TIME_LAPSE_8KUHD = 1013,

    CAMCORDER_QUALITY_TIME_LAPSE_LIST_END = 1013,



    CAMCORDER_QUALITY_HIGH_SPEED_LIST_START = 2000,

    CAMCORDER_QUALITY_HIGH_SPEED_LOW  = 2000,