diff options
author | Zhijun He <zhijunhe@google.com> | 2014-09-10 05:12:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-10 05:12:18 +0000 |
commit | 83ee5564965408307e6f045ce5faed72bc3437b0 (patch) | |
tree | a06226084e4bf874ec9b361ff058e6488e44b93e /media | |
parent | c99d333f59b5559248a5bf3135b7ef85b5f40133 (diff) | |
parent | 9520aa609c505cf8a9ee105bd78dc186cfb7770b (diff) | |
download | frameworks_av-83ee5564965408307e6f045ce5faed72bc3437b0.zip frameworks_av-83ee5564965408307e6f045ce5faed72bc3437b0.tar.gz frameworks_av-83ee5564965408307e6f045ce5faed72bc3437b0.tar.bz2 |
Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev
Diffstat (limited to 'media')
-rw-r--r-- | media/libmedia/MediaProfiles.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp index d2e181b..e2e6042 100644 --- a/media/libmedia/MediaProfiles.cpp +++ b/media/libmedia/MediaProfiles.cpp @@ -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 |