summaryrefslogtreecommitdiffstats
path: root/media/libmedia/MediaProfiles.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2010-09-10 15:06:38 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-10 15:06:38 -0700
commitcc24f76ca5e8c987920d819c399c3eca11432f17 (patch)
tree8ed898524508a1d1bf6b4b2317a3734ff28b72ea /media/libmedia/MediaProfiles.cpp
parentf53873d41edcbe7b2893dd0dd9f35c61850f0316 (diff)
parent1a02fabca518806222212bdc708b36a37a7c3925 (diff)
downloadframeworks_av-cc24f76ca5e8c987920d819c399c3eca11432f17.zip
frameworks_av-cc24f76ca5e8c987920d819c399c3eca11432f17.tar.gz
frameworks_av-cc24f76ca5e8c987920d819c399c3eca11432f17.tar.bz2
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Diffstat (limited to 'media/libmedia/MediaProfiles.cpp')
-rw-r--r--media/libmedia/MediaProfiles.cpp23
1 files changed, 17 insertions, 6 deletions
diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp
index 37a33ed..81647e0 100644
--- a/media/libmedia/MediaProfiles.cpp
+++ b/media/libmedia/MediaProfiles.cpp
@@ -715,13 +715,8 @@ Vector<audio_decoder> MediaProfiles::getAudioDecoders() const
return decoders; // copy out
}
-int MediaProfiles::getCamcorderProfileParamByName(const char *name,
- int cameraId,
- camcorder_quality quality) const
+int MediaProfiles::getCamcorderProfileIndex(int cameraId, camcorder_quality quality) const
{
- LOGV("getCamcorderProfileParamByName: %s for camera %d, quality %d",
- name, cameraId, quality);
-
int index = -1;
for (size_t i = 0, n = mCamcorderProfiles.size(); i < n; ++i) {
if (mCamcorderProfiles[i]->mCameraId == cameraId &&
@@ -730,6 +725,17 @@ int MediaProfiles::getCamcorderProfileParamByName(const char *name,
break;
}
}
+ return index;
+}
+
+int MediaProfiles::getCamcorderProfileParamByName(const char *name,
+ int cameraId,
+ camcorder_quality quality) const
+{
+ LOGV("getCamcorderProfileParamByName: %s for camera %d, quality %d",
+ name, cameraId, quality);
+
+ int index = getCamcorderProfileIndex(cameraId, quality);
if (index == -1) {
LOGE("The given camcorder profile camera %d quality %d is not found",
cameraId, quality);
@@ -752,6 +758,11 @@ int MediaProfiles::getCamcorderProfileParamByName(const char *name,
return -1;
}
+bool MediaProfiles::hasCamcorderProfile(int cameraId, camcorder_quality quality) const
+{
+ return (getCamcorderProfileIndex(cameraId, quality) != -1);
+}
+
Vector<int> MediaProfiles::getImageEncodingQualityLevels(int cameraId) const
{
Vector<int> result;