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 | 12bbe5d7d47747c093ddac2977f594a4a3c1810e (patch) | |
| tree | 4d4a5c63650f7cf75ce4c4023cbb145867767349 | |
| parent | 89aa8fe4cb00d2f24260005b008602232d678684 (diff) | |
| parent | 669012d77b00a2aacb6fd12837f2870f9ec17865 (diff) | |
am 92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
* commit '92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0':
Add QVGA resolution to CamcorderProfile
| -rw-r--r-- | include/media/MediaProfiles.h | 6 | ||||
| -rw-r--r-- | media/libmedia/MediaProfiles.cpp | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h index 4b023d14..eab76480 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, }; /** diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp index 5a8bc603..ad55ff86 100644 --- a/media/libmedia/MediaProfiles.cpp +++ b/media/libmedia/MediaProfiles.cpp @@ -67,6 +67,7 @@ const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = { {"480p", CAMCORDER_QUALITY_480P}, {"720p", CAMCORDER_QUALITY_720P}, {"1080p", CAMCORDER_QUALITY_1080P}, + {"qvga", CAMCORDER_QUALITY_QVGA}, {"timelapselow", CAMCORDER_QUALITY_TIME_LAPSE_LOW}, {"timelapsehigh", CAMCORDER_QUALITY_TIME_LAPSE_HIGH}, @@ -74,7 +75,8 @@ const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = { {"timelapsecif", CAMCORDER_QUALITY_TIME_LAPSE_CIF}, {"timelapse480p", CAMCORDER_QUALITY_TIME_LAPSE_480P}, {"timelapse720p", CAMCORDER_QUALITY_TIME_LAPSE_720P}, - {"timelapse1080p", CAMCORDER_QUALITY_TIME_LAPSE_1080P} + {"timelapse1080p", CAMCORDER_QUALITY_TIME_LAPSE_1080P}, + {"timelapseqvga", CAMCORDER_QUALITY_TIME_LAPSE_QVGA}, }; /*static*/ void @@ -1139,7 +1141,7 @@ int MediaProfiles::getStartTimeOffsetMs(int cameraId) const { if (index >= 0) { offsetTimeMs = mStartTimeOffsets.valueFor(cameraId); } - LOGV("%s: offsetTime=%d ms and cameraId=%d", offsetTimeMs, cameraId); + LOGV("offsetTime=%d ms and cameraId=%d", offsetTimeMs, cameraId); return offsetTimeMs; } |