diff --git a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp index b0aae8e04d..c914b058f3 100644 --- a/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp +++ b/camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp @@ -1524,9 +1524,10 @@ Return CameraHidlTest::DeviceCb::requestStreamBuffers( w = stream.bufferSize; h = 1; } - mParent->allocateGraphicBuffer(w, h, - android_convertGralloc1To0Usage( - halStream.producerUsage, halStream.consumerUsage), + mParent->allocateGraphicBuffer( + w, h, + (uint32_t)android_convertGralloc1To0Usage(halStream.producerUsage, + halStream.consumerUsage), halStream.overrideFormat, &buffer_handle); tmpRetBuffers[j] = {stream.v3_2.id, mNextBufferId, buffer_handle, BufferStatus::OK, @@ -4456,7 +4457,7 @@ void CameraHidlTest::processCaptureRequestInternal(uint64_t bufferUsage, /* We don't look at halStreamConfig.streams[0].consumerUsage * since that is 0 for output streams */ - android_convertGralloc1To0Usage( + (uint32_t)android_convertGralloc1To0Usage( halStreamConfig.streams[0].producerUsage, bufferUsage), halStreamConfig.streams[0].overrideFormat, &buffer_handle); outputBuffer = {halStreamConfig.streams[0].id, @@ -4678,9 +4679,10 @@ TEST_P(CameraHidlTest, processMultiCaptureRequestPreview) { BufferStatus::OK, nullptr, nullptr}; } else { allocateGraphicBuffer(previewStream.width, previewStream.height, - android_convertGralloc1To0Usage(halStream.v3_3.v3_2.producerUsage, - halStream.v3_3.v3_2.consumerUsage), - halStream.v3_3.v3_2.overrideFormat, &buffer_handle); + (uint32_t)android_convertGralloc1To0Usage( + halStream.v3_3.v3_2.producerUsage, + halStream.v3_3.v3_2.consumerUsage), + halStream.v3_3.v3_2.overrideFormat, &buffer_handle); graphicBuffers.push_back(buffer_handle); outputBuffers[k] = {halStream.v3_3.v3_2.id, bufferId, buffer_handle, BufferStatus::OK, nullptr, nullptr}; @@ -4891,9 +4893,10 @@ TEST_P(CameraHidlTest, processCaptureRequestBurstISO) { nullptr, BufferStatus::OK, nullptr, nullptr}; } else { allocateGraphicBuffer(previewStream.width, previewStream.height, - android_convertGralloc1To0Usage(halStreamConfig.streams[0].producerUsage, - halStreamConfig.streams[0].consumerUsage), - halStreamConfig.streams[0].overrideFormat, &buffers[i]); + (uint32_t)android_convertGralloc1To0Usage( + halStreamConfig.streams[0].producerUsage, + halStreamConfig.streams[0].consumerUsage), + halStreamConfig.streams[0].overrideFormat, &buffers[i]); outputBuffers[i] = {halStreamConfig.streams[0].id, bufferId + i, buffers[i], BufferStatus::OK, nullptr, nullptr}; } @@ -4997,9 +5000,10 @@ TEST_P(CameraHidlTest, processCaptureRequestInvalidSinglePreview) { bufferId = 0; } else { allocateGraphicBuffer(previewStream.width, previewStream.height, - android_convertGralloc1To0Usage(halStreamConfig.streams[0].producerUsage, - halStreamConfig.streams[0].consumerUsage), - halStreamConfig.streams[0].overrideFormat, &buffer_handle); + (uint32_t)android_convertGralloc1To0Usage( + halStreamConfig.streams[0].producerUsage, + halStreamConfig.streams[0].consumerUsage), + halStreamConfig.streams[0].overrideFormat, &buffer_handle); } StreamBuffer outputBuffer = {halStreamConfig.streams[0].id, @@ -5120,9 +5124,10 @@ TEST_P(CameraHidlTest, switchToOffline) { buffers[i], BufferStatus::OK, nullptr, nullptr}; } else { // jpeg buffer (w,h) = (blobLen, 1) - allocateGraphicBuffer(jpegBufferSize, /*height*/1, - android_convertGralloc1To0Usage(halStreamConfig3_2.producerUsage, - halStreamConfig3_2.consumerUsage), + allocateGraphicBuffer( + jpegBufferSize, /*height*/ 1, + (uint32_t)android_convertGralloc1To0Usage(halStreamConfig3_2.producerUsage, + halStreamConfig3_2.consumerUsage), halStreamConfig3_2.overrideFormat, &buffers[i]); outputBuffers[i] = {halStreamConfig3_2.id, bufferId + i, buffers[i], BufferStatus::OK, nullptr, nullptr}; @@ -5364,9 +5369,10 @@ TEST_P(CameraHidlTest, flushPreviewRequest) { bufferId = 0; } else { allocateGraphicBuffer(previewStream.width, previewStream.height, - android_convertGralloc1To0Usage(halStreamConfig.streams[0].producerUsage, - halStreamConfig.streams[0].consumerUsage), - halStreamConfig.streams[0].overrideFormat, &buffer_handle); + (uint32_t)android_convertGralloc1To0Usage( + halStreamConfig.streams[0].producerUsage, + halStreamConfig.streams[0].consumerUsage), + halStreamConfig.streams[0].overrideFormat, &buffer_handle); } StreamBuffer outputBuffer = {halStreamConfig.streams[0].id,