| commit | 5e8e66f369fd2f1918495380ed1886e50818e95e | [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 | 2981393cca96745a0028c5cb519820333d9885c6 | |
| parent | 95f24dacbde69295fd21bbf683281b277e097bb1 [diff] | |
| parent | 05dd06eb54a4e15352405a3a5cedce6a7940b96b [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