| commit | 0c102d404d7f152b7d05433732ef4d1efeac533d | [log] [tgz] |
|---|---|---|
| author | Dan Willemsen <dwillemsen@google.com> | Wed Dec 12 22:19:37 2018 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Dec 12 22:19:37 2018 -0800 |
| tree | fc36d1942c322125cbacca1036f92b0076a2d7af | |
| parent | bd2f653de8664083aed50699a8788f5401ddd1dc [diff] | |
| parent | 9119ce5e4cefc9481eb4a3dcec1171a693327c9f [diff] |
Merge "Convert libaudioprocessing to Android.bp" am: b21b5ab7c6 am: 9119ce5e4c Change-Id: I105754214c3363d5e2d4d03a6a079b7b858945e2
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()); }