| commit | 7dac08bb5b0750188e4cc5ffcf6330c1351cd759 | [log] [tgz] |
|---|---|---|
| author | Ivan Lozano <ivanlozano@google.com> | Thu Dec 13 15:24:08 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 13 15:24:08 2018 -0800 |
| tree | fd9336d0756b66608a7af99f190446e594fd7268 | |
| parent | 4c2c9d83df9d05fa42d024b527a166a83642fd33 [diff] | |
| parent | 9267f7a25392e8a36c3b3dc797774972c84d251b [diff] |
Merge "Remove CFI diagnostics." am: ebd8c69ac5 am: 9267f7a253 Change-Id: I4b143ead6520a0e99d3038f0bec6e5c81ac243ae
diff --git a/media/libmediaplayer2/nuplayer2/NuPlayer2Driver.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2Driver.cpp index 8fbd8dd..398c246 100644 --- a/media/libmediaplayer2/nuplayer2/NuPlayer2Driver.cpp +++ b/media/libmediaplayer2/nuplayer2/NuPlayer2Driver.cpp
@@ -327,7 +327,7 @@ switch (mState) { case STATE_RUNNING: mPlayer->pause(); - [[fallthrough]]; + // fall through case STATE_PAUSED: mState = STATE_STOPPED;
diff --git a/services/camera/libcameraservice/api1/client2/CaptureSequencer.cpp b/services/camera/libcameraservice/api1/client2/CaptureSequencer.cpp index 84f0a89..70341c5 100644 --- a/services/camera/libcameraservice/api1/client2/CaptureSequencer.cpp +++ b/services/camera/libcameraservice/api1/client2/CaptureSequencer.cpp
@@ -547,9 +547,11 @@ return DONE; } - if (l.mParameters.isDeviceZslSupported) { + if ((l.mParameters.isDeviceZslSupported) && (l.mParameters.state != Parameters::RECORD) && + (l.mParameters.state != Parameters::VIDEO_SNAPSHOT)) { // If device ZSL is supported, drop all pending preview buffers to reduce the chance of // rendering preview frames newer than the still frame. + // Additionally, preview must not get interrupted during video recording. client->getCameraDevice()->dropStreamBuffers(true, client->getPreviewStreamId()); }