diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 12:10:37 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-02-03 12:10:37 +0100 |
| commit | d4590dda7776ec99e4e879c47b3372a5f4b13dcd (patch) | |
| tree | 5319f997c7cd31d610ce5ed80c847bd7d6d043fa /media/libstagefright/CameraSource.cpp | |
| parent | 998f3a696f0d671832624637c771e3bda3e0c9f5 (diff) | |
| parent | fda1413978cabfafdf184c02aa20d2fd8c095616 (diff) | |
| download | frameworks_av-d4590dda7776ec99e4e879c47b3372a5f4b13dcd.zip frameworks_av-d4590dda7776ec99e4e879c47b3372a5f4b13dcd.tar.gz frameworks_av-d4590dda7776ec99e4e879c47b3372a5f4b13dcd.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_av into replicant-6.0
Diffstat (limited to 'media/libstagefright/CameraSource.cpp')
| -rw-r--r-- | media/libstagefright/CameraSource.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp index 4ee878a..e2ad924 100644 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -325,12 +325,6 @@ status_t CameraSource::isCameraColorFormatSupported( return OK; } -static int32_t getHighSpeedFrameRate(const CameraParameters& params) { - const char* hsr = params.get("video-hsr"); - int32_t rate = (hsr != NULL && strncmp(hsr, "off", 3)) ? atoi(hsr) : 0; - return rate > 240 ? 240 : rate; -} - /* * Configure the camera to use the requested video size * (width and height) and/or frame rate. If both width and @@ -383,10 +377,6 @@ status_t CameraSource::configureCamera( params->get(CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATES); CHECK(supportedFrameRates != NULL); ALOGV("Supported frame rates: %s", supportedFrameRates); - if (getHighSpeedFrameRate(*params)) { - ALOGI("Use default 30fps for HighSpeed %dfps", frameRate); - frameRate = 30; - } char buf[4]; snprintf(buf, 4, "%d", frameRate); if (strstr(supportedFrameRates, buf) == NULL) { @@ -488,8 +478,6 @@ status_t CameraSource::checkFrameRate( ALOGE("Failed to retrieve preview frame rate (%d)", frameRateActual); return UNKNOWN_ERROR; } - int32_t highSpeedRate = getHighSpeedFrameRate(params); - frameRateActual = highSpeedRate ? highSpeedRate : frameRateActual; // Check the actual video frame rate against the target/requested // video frame rate. |