| commit | 86ae67d393cf8997ce2bb31974f89331d4387f71 | [log] [tgz] |
|---|---|---|
| author | George Burgess IV <gbiv@google.com> | Wed Dec 12 03:31:41 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 12 03:31:41 2018 -0800 |
| tree | 7cf7b6abb0916f0e32a5514b159f30120d22da77 | |
| parent | a33c8e8e7a4ac2f2fc28c7619c54d493c6f4b1ad [diff] | |
| parent | 39f89c6526a72683eacae57511b1d28220efcc29 [diff] |
Merge "Suppress a static-analyzer warning" am: 883b34335e am: 39f89c6526 Change-Id: I4924052680b49a560c63296c99b9a16cd55c30a9
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()); }