diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-06-11 20:38:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-10 21:32:31 +0000 |
| commit | 77fc9bbc4163c7ec7ac4b0dabf4f84325cca8473 (patch) | |
| tree | 21f9467b3fbe7d4eb1993a3335c9cb95253176d8 /media | |
| parent | 11cbb06b35cbcb488c7f39b71886ce379e57f867 (diff) | |
| parent | 5f6af1a8e34381ca2ac2527fcefe220a22f49b53 (diff) | |
| download | frameworks_av-77fc9bbc4163c7ec7ac4b0dabf4f84325cca8473.zip frameworks_av-77fc9bbc4163c7ec7ac4b0dabf4f84325cca8473.tar.gz frameworks_av-77fc9bbc4163c7ec7ac4b0dabf4f84325cca8473.tar.bz2 | |
Merge "MediaProfiles: Add 4K video related constants"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/MediaProfiles.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp index 1074da9..28238c4 100644 --- a/media/libmedia/MediaProfiles.cpp +++ b/media/libmedia/MediaProfiles.cpp @@ -69,6 +69,7 @@ const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = { {"480p", CAMCORDER_QUALITY_480P}, {"720p", CAMCORDER_QUALITY_720P}, {"1080p", CAMCORDER_QUALITY_1080P}, + {"2160p", CAMCORDER_QUALITY_2160P}, {"qvga", CAMCORDER_QUALITY_QVGA}, {"timelapselow", CAMCORDER_QUALITY_TIME_LAPSE_LOW}, @@ -78,6 +79,7 @@ const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = { {"timelapse480p", CAMCORDER_QUALITY_TIME_LAPSE_480P}, {"timelapse720p", CAMCORDER_QUALITY_TIME_LAPSE_720P}, {"timelapse1080p", CAMCORDER_QUALITY_TIME_LAPSE_1080P}, + {"timelapse2160p", CAMCORDER_QUALITY_TIME_LAPSE_2160P}, {"timelapseqvga", CAMCORDER_QUALITY_TIME_LAPSE_QVGA}, }; |