commit 67d995a5ccd94309005f351b3a33a5da61669096
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 15 22:15:28 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 15 22:15:28 2020 +0000
tree 7cf41284b185ca0bb151e1a8f87e025e1352e540
parent f096eca2412d1655c72d6e047025f791cd436797
parent b5c3948459bf9bc15ad6341660c17bfe825f703a

Merge "Revert "C2SoftHevcEnc: Increase supported resolution to 960x544"" am: 5bf1097c4f am: fd4eb82dca am: 0ab3022342 am: b5c3948459

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1363956

Change-Id: Ieed4732c4e280d87111490233e7c49e0dd63a5e6

services/camera/libcameraservice/device3/Camera3OutputUtils.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp b/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
index eea5ef1..08cde5d 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
@@ -1218,13 +1218,13 @@
             return;
         }
 
+        bufRet.streamId = streamId;
         if (outputStream->isAbandoned()) {
             bufRet.val.error(StreamBufferRequestError::STREAM_DISCONNECTED);
             allReqsSucceeds = false;
             continue;
         }
 
-        bufRet.streamId = streamId;
         size_t handOutBufferCount = outputStream->getOutstandingBuffersCount();
         uint32_t numBuffersRequested = bufReq.numBuffersRequested;
         size_t totalHandout = handOutBufferCount + numBuffersRequested;