summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorZhijun He <zhijunhe@google.com>2014-09-10 05:12:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-10 05:12:18 +0000
commit83ee5564965408307e6f045ce5faed72bc3437b0 (patch)
treea06226084e4bf874ec9b361ff058e6488e44b93e /include/media
parentc99d333f59b5559248a5bf3135b7ef85b5f40133 (diff)
parent9520aa609c505cf8a9ee105bd78dc186cfb7770b (diff)
downloadframeworks_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 'include/media')
-rw-r--r--include/media/MediaProfiles.h3
1 files changed, 2 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,
};
/**