diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-09-10 07:15:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-10 07:15:25 +0000 |
| commit | ef2e361980531f0d315f89b783c2de3ea2abae95 (patch) | |
| tree | d2beece5f40cb6762607117f79455c27cabcdffb | |
| parent | 5bec1b725df12905e86c35ea142b3a628b266a6c (diff) | |
| parent | 83ee5564965408307e6f045ce5faed72bc3437b0 (diff) | |
| download | frameworks_av-ef2e361980531f0d315f89b783c2de3ea2abae95.zip frameworks_av-ef2e361980531f0d315f89b783c2de3ea2abae95.tar.gz frameworks_av-ef2e361980531f0d315f89b783c2de3ea2abae95.tar.bz2 | |
am 83ee5564: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev
* commit '83ee5564965408307e6f045ce5faed72bc3437b0':
CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
| -rw-r--r-- | include/media/MediaProfiles.h | 3 | ||||
| -rw-r--r-- | media/libmedia/MediaProfiles.cpp | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h index 253c557..f061d22 100644 --- a/include/media/MediaProfiles.h +++ b/include/media/MediaProfiles.h @@ -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, }; /** 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 |