Merge "Camera HAL Vts : Fix usage flag combination during gralloc allocation." into stage-aosp-rvc-ts-dev am: 7cc876ee02 am: 314611d129 am: 4181fe2378 am: 03a6282934

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12173503

Change-Id: I995b94362e2f3c07e4ba4a038ade70671d652f43
This commit is contained in:
TreeHugger Robot
2020-08-06 16:57:20 +00:00
committed by Automerger Merge Worker

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,