diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-09-10 07:27:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-10 07:27:33 +0000 |
| commit | 49b03d4ce121047015906cfe2bb01012343fa16b (patch) | |
| tree | a5336fb30a8466b2ce0f148417b09991cf3dd020 /media | |
| parent | 13f90db44d75313d1eed242a23aaf00b9efa0a68 (diff) | |
| parent | ef2e361980531f0d315f89b783c2de3ea2abae95 (diff) | |
| download | frameworks_av-49b03d4ce121047015906cfe2bb01012343fa16b.zip frameworks_av-49b03d4ce121047015906cfe2bb01012343fa16b.tar.gz frameworks_av-49b03d4ce121047015906cfe2bb01012343fa16b.tar.bz2 | |
am ef2e3619: am 83ee5564: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev
* commit 'ef2e361980531f0d315f89b783c2de3ea2abae95':
CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
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 |