Merge "Camera: fix stream ID for failed buffer request" into rvc-qpr-dev

            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;