| commit | f66cc52cc5a075b86b585cf72c4a41f6907b2142 | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Thu Oct 04 09:56:44 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Oct 04 09:56:44 2012 -0700 |
| tree | 0f50e30b831044b06d09195d11ad87724b4a822b | |
| parent | d69fd4d2567f9fce02252ce10d7ae3a28fc79e04 [diff] | |
| parent | 04273cb14d2326e85bb047ea6ef75294c8b3d561 [diff] |
Merge "Camera2: Fix deadlock while zooming during record" into jb-mr1-dev
diff --git a/media/libstagefright/wifi-display/source/WifiDisplaySource.h b/media/libstagefright/wifi-display/source/WifiDisplaySource.h index 8c043cd..c30e3cb 100644 --- a/media/libstagefright/wifi-display/source/WifiDisplaySource.h +++ b/media/libstagefright/wifi-display/source/WifiDisplaySource.h
@@ -26,7 +26,7 @@ namespace android { -#define REQUIRE_HDCP 0 +#define REQUIRE_HDCP 1 struct IHDCP; struct IRemoteDisplayClient;
diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index 5248e97..74f4a7e 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp
@@ -1057,6 +1057,10 @@ validatedParams.previewFpsRange[1] = availableFrameRates.data.i32[i+1]; } + newParams.set(CameraParameters::KEY_PREVIEW_FPS_RANGE, + String8::format("%d,%d", + validatedParams.previewFpsRange[0] * kFpsToApiScale, + validatedParams.previewFpsRange[1] * kFpsToApiScale)); } // PICTURE_SIZE