diff options
| author | James Dong <jdong@google.com> | 2011-09-19 20:09:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-19 20:09:00 -0700 |
| commit | 3907c79aebf8621a5a4880c9e66db3c49a44f359 (patch) | |
| tree | 57278dd5e12f6788d4d624cc75ec969476dafdfe /include | |
| parent | cb61187783b2a995cfb56ea6c4a396ebff13ff0f (diff) | |
| parent | 92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0 (diff) | |
| download | frameworks_base-3907c79aebf8621a5a4880c9e66db3c49a44f359.zip frameworks_base-3907c79aebf8621a5a4880c9e66db3c49a44f359.tar.gz frameworks_base-3907c79aebf8621a5a4880c9e66db3c49a44f359.tar.bz2 | |
am 92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
* commit '92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0':
Add QVGA resolution to CamcorderProfile
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/MediaProfiles.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h index 4b023d1..eab7648 100644 --- a/include/media/MediaProfiles.h +++ b/include/media/MediaProfiles.h @@ -32,7 +32,8 @@ enum camcorder_quality { CAMCORDER_QUALITY_480P = 4, CAMCORDER_QUALITY_720P = 5, CAMCORDER_QUALITY_1080P = 6, - CAMCORDER_QUALITY_LIST_END = 6, + CAMCORDER_QUALITY_QVGA = 7, + CAMCORDER_QUALITY_LIST_END = 7, CAMCORDER_QUALITY_TIME_LAPSE_LIST_START = 1000, CAMCORDER_QUALITY_TIME_LAPSE_LOW = 1000, @@ -42,7 +43,8 @@ enum camcorder_quality { CAMCORDER_QUALITY_TIME_LAPSE_480P = 1004, CAMCORDER_QUALITY_TIME_LAPSE_720P = 1005, CAMCORDER_QUALITY_TIME_LAPSE_1080P = 1006, - CAMCORDER_QUALITY_TIME_LAPSE_LIST_END = 1006, + CAMCORDER_QUALITY_TIME_LAPSE_QVGA = 1007, + CAMCORDER_QUALITY_TIME_LAPSE_LIST_END = 1007, }; /** |