summaryrefslogtreecommitdiffstats
path: root/media/libmedia/MediaProfiles.cpp
diff options
context:
space:
mode:
authorPraveen Chavan <pchavan@codeaurora.org>2015-07-14 12:36:58 -0700
committerLinux Build Service Account <lnxbuild@localhost>2015-10-06 03:24:06 -0600
commitef3c3e487f79571037226c3d769455a9916f9a80 (patch)
treee80fb187dd4a27a3630d1eb01f89802eccf80758 /media/libmedia/MediaProfiles.cpp
parent96eb2b8a7b496fa7e3b68e68e2186354e6210d44 (diff)
downloadframeworks_av-ef3c3e487f79571037226c3d769455a9916f9a80.zip
frameworks_av-ef3c3e487f79571037226c3d769455a9916f9a80.tar.gz
frameworks_av-ef3c3e487f79571037226c3d769455a9916f9a80.tar.bz2
CamcorderProfiles: add VGA and 4K-DCI profiles
Also add high-speed profile for CIF. Change-Id: Iacd8537f62112171ee611a7534f9d432f45d5d3f
Diffstat (limited to 'media/libmedia/MediaProfiles.cpp')
-rw-r--r--media/libmedia/MediaProfiles.cpp15
1 files changed, 13 insertions, 2 deletions
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) {