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

Commit 77fc9bbc authored by Zhijun He's avatar Zhijun He Committed by Android (Google) Code Review
Browse files

Merge "MediaProfiles: Add 4K video related constants"

parents 11cbb06b 5f6af1a8

include/media/MediaProfiles.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -33,7 +33,8 @@ enum camcorder_quality { 
    CAMCORDER_QUALITY_720P = 5,

    CAMCORDER_QUALITY_720P = 5,

    CAMCORDER_QUALITY_1080P = 6,

    CAMCORDER_QUALITY_1080P = 6,

    CAMCORDER_QUALITY_QVGA = 7,

    CAMCORDER_QUALITY_QVGA = 7,

    CAMCORDER_QUALITY_LIST_END = 7,

    CAMCORDER_QUALITY_2160P = 8,

    CAMCORDER_QUALITY_LIST_END = 8,





    CAMCORDER_QUALITY_TIME_LAPSE_LIST_START = 1000,

    CAMCORDER_QUALITY_TIME_LAPSE_LIST_START = 1000,

    CAMCORDER_QUALITY_TIME_LAPSE_LOW  = 1000,

    CAMCORDER_QUALITY_TIME_LAPSE_LOW  = 1000,
@@ -44,7 +45,8 @@ enum camcorder_quality { 
    CAMCORDER_QUALITY_TIME_LAPSE_720P = 1005,

    CAMCORDER_QUALITY_TIME_LAPSE_720P = 1005,

    CAMCORDER_QUALITY_TIME_LAPSE_1080P = 1006,

    CAMCORDER_QUALITY_TIME_LAPSE_1080P = 1006,

    CAMCORDER_QUALITY_TIME_LAPSE_QVGA = 1007,

    CAMCORDER_QUALITY_TIME_LAPSE_QVGA = 1007,

    CAMCORDER_QUALITY_TIME_LAPSE_LIST_END = 1007,

    CAMCORDER_QUALITY_TIME_LAPSE_2160P = 1008,

    CAMCORDER_QUALITY_TIME_LAPSE_LIST_END = 1008,

};

};





/**

/**

media/libmedia/MediaProfiles.cpp

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

    {"480p", CAMCORDER_QUALITY_480P},

    {"720p", CAMCORDER_QUALITY_720P},

    {"720p", CAMCORDER_QUALITY_720P},

    {"1080p", CAMCORDER_QUALITY_1080P},

    {"1080p", CAMCORDER_QUALITY_1080P},

    {"2160p", CAMCORDER_QUALITY_2160P},

    {"qvga", CAMCORDER_QUALITY_QVGA},

    {"qvga", CAMCORDER_QUALITY_QVGA},





    {"timelapselow",  CAMCORDER_QUALITY_TIME_LAPSE_LOW},

    {"timelapselow",  CAMCORDER_QUALITY_TIME_LAPSE_LOW},
@@ -78,6 +79,7 @@ const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = { 
    {"timelapse480p", CAMCORDER_QUALITY_TIME_LAPSE_480P},

    {"timelapse480p", CAMCORDER_QUALITY_TIME_LAPSE_480P},

    {"timelapse720p", CAMCORDER_QUALITY_TIME_LAPSE_720P},

    {"timelapse720p", CAMCORDER_QUALITY_TIME_LAPSE_720P},

    {"timelapse1080p", CAMCORDER_QUALITY_TIME_LAPSE_1080P},

    {"timelapse1080p", CAMCORDER_QUALITY_TIME_LAPSE_1080P},

    {"timelapse2160p", CAMCORDER_QUALITY_TIME_LAPSE_2160P},

    {"timelapseqvga", CAMCORDER_QUALITY_TIME_LAPSE_QVGA},

    {"timelapseqvga", CAMCORDER_QUALITY_TIME_LAPSE_QVGA},

};

};