diff options
| author | Nipun Kwatra <nkwatra@google.com> | 2010-09-16 22:25:23 -0700 |
|---|---|---|
| committer | Nipun Kwatra <nkwatra@google.com> | 2010-09-17 13:19:13 -0700 |
| commit | d5672bc7162fa49abf9bb5844195887e911aa7ce (patch) | |
| tree | ba0f7753e3c77780ed1783c999512d0952384505 /include/media/MediaProfiles.h | |
| parent | 59d9e31c503e5c2f49448362a0d3a8f1150fb6c2 (diff) | |
| download | frameworks_av-d5672bc7162fa49abf9bb5844195887e911aa7ce.zip frameworks_av-d5672bc7162fa49abf9bb5844195887e911aa7ce.tar.gz frameworks_av-d5672bc7162fa49abf9bb5844195887e911aa7ce.tar.bz2 | |
Adding default profiles for specific levels.
The low and high profiles should each match one of the
specific profiles. So we need to add the specific profiles
corresponding to the low/high profiles. This makes the
default profile compliant to documentation + cts.
Also fixed javadoc to account time lapse profiles.
Change-Id: I34e7307d00ce261c69dc10ead2900025c7f6d428
Diffstat (limited to 'include/media/MediaProfiles.h')
| -rw-r--r-- | include/media/MediaProfiles.h | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h index 0ec7eec..aa97874 100644 --- a/include/media/MediaProfiles.h +++ b/include/media/MediaProfiles.h @@ -302,10 +302,25 @@ private: // If the xml configuration file does not exist, use hard-coded values static MediaProfiles* createDefaultInstance(); - static CamcorderProfile *createDefaultCamcorderLowProfile(); - static CamcorderProfile *createDefaultCamcorderHighProfile(); - static CamcorderProfile *createDefaultCamcorderTimeLapseLowProfile(); - static CamcorderProfile *createDefaultCamcorderTimeLapseHighProfile(); + + static CamcorderProfile *createDefaultCamcorderQcifProfile(camcorder_quality quality); + static CamcorderProfile *createDefaultCamcorderCifProfile(camcorder_quality quality); + static void createDefaultCamcorderLowProfiles( + MediaProfiles::CamcorderProfile **lowProfile, + MediaProfiles::CamcorderProfile **lowSpecificProfile); + static void createDefaultCamcorderHighProfiles( + MediaProfiles::CamcorderProfile **highProfile, + MediaProfiles::CamcorderProfile **highSpecificProfile); + + static CamcorderProfile *createDefaultCamcorderTimeLapseQcifProfile(camcorder_quality quality); + static CamcorderProfile *createDefaultCamcorderTimeLapse480pProfile(camcorder_quality quality); + static void createDefaultCamcorderTimeLapseLowProfiles( + MediaProfiles::CamcorderProfile **lowTimeLapseProfile, + MediaProfiles::CamcorderProfile **lowSpecificTimeLapseProfile); + static void createDefaultCamcorderTimeLapseHighProfiles( + MediaProfiles::CamcorderProfile **highTimeLapseProfile, + MediaProfiles::CamcorderProfile **highSpecificTimeLapseProfile); + static void createDefaultCamcorderProfiles(MediaProfiles *profiles); static void createDefaultVideoEncoders(MediaProfiles *profiles); static void createDefaultAudioEncoders(MediaProfiles *profiles); |