diff options
| -rw-r--r-- | include/media/MediaProfiles.h | 10 | ||||
| -rw-r--r-- | media/libmedia/MediaProfiles.cpp | 15 |
2 files changed, 23 insertions, 2 deletions
diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h index e02918f..e0d3e70 100644 --- a/include/media/MediaProfiles.h +++ b/include/media/MediaProfiles.h @@ -56,6 +56,16 @@ enum camcorder_quality { CAMCORDER_QUALITY_HIGH_SPEED_1080P = 2004, CAMCORDER_QUALITY_HIGH_SPEED_2160P = 2005, CAMCORDER_QUALITY_HIGH_SPEED_LIST_END = 2005, + + CAMCORDER_QUALITY_VENDOR_START = 10000, + CAMCORDER_QUALITY_VGA = 10000, + CAMCORDER_QUALITY_4KDCI = 10001, + CAMCORDER_QUALITY_TIME_LAPSE_VGA = 10002, + CAMCORDER_QUALITY_TIME_LAPSE_4KDCI = 10003, + CAMCORDER_QUALITY_HIGH_SPEED_CIF = 10004, + CAMCORDER_QUALITY_HIGH_SPEED_VGA = 10005, + CAMCORDER_QUALITY_HIGH_SPEED_4KDCI = 10006, + CAMCORDER_QUALITY_VENDOR_END = 10006, }; enum video_decoder { diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp index c5790fb..d5cb4eb 100644 --- a/media/libmedia/MediaProfiles.cpp +++ b/media/libmedia/MediaProfiles.cpp @@ -88,6 +88,15 @@ 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}, }; #if LOG_NDEBUG @@ -423,8 +432,10 @@ MediaProfiles::startElementHandler(void *userData, const char *name, const char } static bool isCamcorderProfile(camcorder_quality quality) { - return quality >= CAMCORDER_QUALITY_LIST_START && - quality <= CAMCORDER_QUALITY_LIST_END; + return (quality >= CAMCORDER_QUALITY_LIST_START && + quality <= CAMCORDER_QUALITY_LIST_END) || + (quality >= CAMCORDER_QUALITY_VENDOR_START && + quality <= CAMCORDER_QUALITY_VENDOR_END); } static bool isTimelapseProfile(camcorder_quality quality) { |