diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-06-10 08:26:33 -0700 |
|---|---|---|
| committer | Zhijun He <zhijunhe@google.com> | 2014-06-10 22:03:55 +0000 |
| commit | 5f6af1a8e34381ca2ac2527fcefe220a22f49b53 (patch) | |
| tree | 17cee62e00cb423322c36ed322234df6f07eab13 | |
| parent | 31dcd338b3826928646d77f23f977ecdd52598a3 (diff) | |
| download | frameworks_av-5f6af1a8e34381ca2ac2527fcefe220a22f49b53.zip frameworks_av-5f6af1a8e34381ca2ac2527fcefe220a22f49b53.tar.gz frameworks_av-5f6af1a8e34381ca2ac2527fcefe220a22f49b53.tar.bz2 | |
MediaProfiles: Add 4K video related constants
Bug: 15287656
Change-Id: I4c49640a349afb336f52db1636902fc216bff6ad
| -rw-r--r-- | include/media/MediaProfiles.h | 6 | ||||
| -rw-r--r-- | media/libmedia/MediaProfiles.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h index 9fc962c..d202fbc 100644 --- a/include/media/MediaProfiles.h +++ b/include/media/MediaProfiles.h @@ -33,7 +33,8 @@ enum camcorder_quality { CAMCORDER_QUALITY_720P = 5, CAMCORDER_QUALITY_1080P = 6, CAMCORDER_QUALITY_QVGA = 7, - CAMCORDER_QUALITY_LIST_END = 7, + CAMCORDER_QUALITY_2160P = 8, + CAMCORDER_QUALITY_LIST_END = 8, CAMCORDER_QUALITY_TIME_LAPSE_LIST_START = 1000, CAMCORDER_QUALITY_TIME_LAPSE_LOW = 1000, @@ -44,7 +45,8 @@ enum camcorder_quality { CAMCORDER_QUALITY_TIME_LAPSE_720P = 1005, CAMCORDER_QUALITY_TIME_LAPSE_1080P = 1006, CAMCORDER_QUALITY_TIME_LAPSE_QVGA = 1007, - CAMCORDER_QUALITY_TIME_LAPSE_LIST_END = 1007, + CAMCORDER_QUALITY_TIME_LAPSE_2160P = 1008, + CAMCORDER_QUALITY_TIME_LAPSE_LIST_END = 1008, }; /** 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}, }; |