diff options
| author | Nipun Kwatra <nkwatra@google.com> | 2010-09-10 15:45:57 -0700 |
|---|---|---|
| committer | Nipun Kwatra <nkwatra@google.com> | 2010-09-10 18:01:46 -0700 |
| commit | 9783ed8f85af3d7c72030098acfed7e1d6638349 (patch) | |
| tree | 71456f82bd54f185c4a5d36febe650dc27878527 | |
| parent | cc24f76ca5e8c987920d819c399c3eca11432f17 (diff) | |
| download | frameworks_av-9783ed8f85af3d7c72030098acfed7e1d6638349.zip frameworks_av-9783ed8f85af3d7c72030098acfed7e1d6638349.tar.gz frameworks_av-9783ed8f85af3d7c72030098acfed7e1d6638349.tar.bz2 | |
Exposing specific profile levels + hasProfile().
- Exposing the specific resolution profile levels
QUALITY_{QCIF,CIF,480P,720P,1080P} and the new time lapse profiles
QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,CIF,480P,720P,1080P}
- Unhiding the hasProfile() function used to test if a given profile exists.
Change-Id: I5d8b9e1ba61718f304235e76d85244e428e68643
| -rw-r--r-- | include/media/MediaProfiles.h | 14 | ||||
| -rw-r--r-- | media/libmedia/MediaProfiles.cpp | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h index 183bb1e..0ec7eec 100644 --- a/include/media/MediaProfiles.h +++ b/include/media/MediaProfiles.h @@ -27,16 +27,18 @@ enum camcorder_quality { CAMCORDER_QUALITY_LOW = 0, CAMCORDER_QUALITY_HIGH = 1, CAMCORDER_QUALITY_QCIF = 2, - CAMCORDER_QUALITY_480P = 3, - CAMCORDER_QUALITY_720P = 4, - CAMCORDER_QUALITY_1080P = 5, + CAMCORDER_QUALITY_CIF = 3, + CAMCORDER_QUALITY_480P = 4, + CAMCORDER_QUALITY_720P = 5, + CAMCORDER_QUALITY_1080P = 6, CAMCORDER_QUALITY_TIME_LAPSE_LOW = 1000, CAMCORDER_QUALITY_TIME_LAPSE_HIGH = 1001, CAMCORDER_QUALITY_TIME_LAPSE_QCIF = 1002, - CAMCORDER_QUALITY_TIME_LAPSE_480P = 1003, - CAMCORDER_QUALITY_TIME_LAPSE_720P = 1004, - CAMCORDER_QUALITY_TIME_LAPSE_1080P = 1005 + CAMCORDER_QUALITY_TIME_LAPSE_CIF = 1003, + CAMCORDER_QUALITY_TIME_LAPSE_480P = 1004, + CAMCORDER_QUALITY_TIME_LAPSE_720P = 1005, + CAMCORDER_QUALITY_TIME_LAPSE_1080P = 1006 }; enum video_decoder { diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp index 81647e0..645c163 100644 --- a/media/libmedia/MediaProfiles.cpp +++ b/media/libmedia/MediaProfiles.cpp @@ -62,6 +62,7 @@ const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = { {"low", CAMCORDER_QUALITY_LOW}, {"high", CAMCORDER_QUALITY_HIGH}, {"qcif", CAMCORDER_QUALITY_QCIF}, + {"cif", CAMCORDER_QUALITY_CIF}, {"480p", CAMCORDER_QUALITY_480P}, {"720p", CAMCORDER_QUALITY_720P}, {"1080p", CAMCORDER_QUALITY_1080P}, @@ -69,6 +70,7 @@ const MediaProfiles::NameToTagMap MediaProfiles::sCamcorderQualityNameMap[] = { {"timelapselow", CAMCORDER_QUALITY_TIME_LAPSE_LOW}, {"timelapsehigh", CAMCORDER_QUALITY_TIME_LAPSE_HIGH}, {"timelapseqcif", CAMCORDER_QUALITY_TIME_LAPSE_QCIF}, + {"timelapsecif", CAMCORDER_QUALITY_TIME_LAPSE_CIF}, {"timelapse480p", CAMCORDER_QUALITY_TIME_LAPSE_480P}, {"timelapse720p", CAMCORDER_QUALITY_TIME_LAPSE_720P}, {"timelapse1080p", CAMCORDER_QUALITY_TIME_LAPSE_1080P} |