Merge "Camera HAL Vts : Fix usage flag combination during gralloc allocation." into stage-aosp-rvc-ts-dev

This commit is contained in:
TreeHugger Robot
2020-07-29 19:57:28 +00:00
committed by Android (Google) Code Review

View File

@@ -4453,9 +4453,12 @@ void CameraHidlTest::processCaptureRequestInternal(uint64_t bufferUsage,
nullptr}; nullptr};
} else { } else {
allocateGraphicBuffer(testStream.width, testStream.height, allocateGraphicBuffer(testStream.width, testStream.height,
android_convertGralloc1To0Usage(halStreamConfig.streams[0].producerUsage, /* We don't look at halStreamConfig.streams[0].consumerUsage
halStreamConfig.streams[0].consumerUsage), * since that is 0 for output streams
halStreamConfig.streams[0].overrideFormat, &buffer_handle); */
android_convertGralloc1To0Usage(
halStreamConfig.streams[0].producerUsage, bufferUsage),
halStreamConfig.streams[0].overrideFormat, &buffer_handle);
outputBuffer = {halStreamConfig.streams[0].id, outputBuffer = {halStreamConfig.streams[0].id,
bufferId, bufferId,
buffer_handle, buffer_handle,