diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-03-13 20:57:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-03-13 20:57:55 -0700 |
| commit | 8255f393585be4f2cb7c7384eb5871d95f468ffe (patch) | |
| tree | 218a5f4a11e3953220da216e4d9616ae5415bb6e /src/com/android/camera/CaptureModule.java | |
| parent | f57d3b4bfda6f86b65f8bb3a345996b00bd559e0 (diff) | |
| parent | c1585c528b9a474a48b78d27312ecbb2e04678a6 (diff) | |
Merge "SnapdragonCamera:Fix recording FC"
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 828561019..72a972894 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -3657,8 +3657,13 @@ public class CaptureModule implements CameraModule, PhotoController, List<Surface> surfaces = new ArrayList<>(); Surface surface = getPreviewSurfaceForSession(cameraId); - setUpVideoPreviewRequestBuilder(surface, cameraId); mFrameProcessor.onOpen(getFrameProcFilterId(),mVideoSize); + if (getFrameProcFilterId().size() == 1 && getFrameProcFilterId().get(0) == + FrameProcessor.FILTER_MAKEUP) { + setUpVideoPreviewRequestBuilder(mFrameProcessor.getInputSurfaces().get(0),cameraId); + } else { + setUpVideoPreviewRequestBuilder(surface, cameraId); + } if(mFrameProcessor.isFrameFilterEnabled()) { mActivity.runOnUiThread(new Runnable() { public void run() { |