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

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

Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev

parents c99d333f 9520aa60

include/media/MediaProfiles.h

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ enum camcorder_quality { 
    CAMCORDER_QUALITY_HIGH_SPEED_480P = 2002,

    CAMCORDER_QUALITY_HIGH_SPEED_720P = 2003,

    CAMCORDER_QUALITY_HIGH_SPEED_1080P = 2004,

    CAMCORDER_QUALITY_HIGH_SPEED_LIST_END = 2004,

    CAMCORDER_QUALITY_HIGH_SPEED_2160P = 2005,

    CAMCORDER_QUALITY_HIGH_SPEED_LIST_END = 2005,

};



/**

media/libmedia/MediaProfiles.cpp

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = { 
    {"highspeed480p", CAMCORDER_QUALITY_HIGH_SPEED_480P},

    {"highspeed720p", CAMCORDER_QUALITY_HIGH_SPEED_720P},

    {"highspeed1080p", CAMCORDER_QUALITY_HIGH_SPEED_1080P},

    {"highspeed2160p", CAMCORDER_QUALITY_HIGH_SPEED_2160P},

};



#if LOG_NDEBUG