Merge "Don't query unused values" into main

This commit is contained in:
Treehugger Robot
2024-01-17 19:33:52 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 6 deletions

View File

@@ -222,10 +222,9 @@ void EvsVideoEmulatedCamera::onCodecOutputAvailable(const int32_t index,
// Lock our output buffer for writing
uint8_t* pixels = nullptr;
int32_t bytesPerStride = 0;
auto& mapper = ::android::GraphicBufferMapper::get();
mapper.lock(renderBufferHandle, GRALLOC_USAGE_SW_WRITE_OFTEN | GRALLOC_USAGE_SW_READ_NEVER,
::android::Rect(mWidth, mHeight), (void**)&pixels, nullptr, &bytesPerStride);
::android::Rect(mWidth, mHeight), (void**)&pixels);
// If we failed to lock the pixel buffer, we're about to crash, but log it first
if (!pixels) {

View File

@@ -630,10 +630,7 @@ int colorFormatConversion(BufferInfo* buffer, buffer_handle_t buff, PixelFormat
if (error != android::NO_ERROR) return 1;
} else {
void* data;
int32_t outBytesPerPixel;
int32_t outBytesPerStride;
error = gbmapper.lock(buff, buffer->omxBuffer.attr.anwBuffer.usage, rect, &data,
&outBytesPerPixel, &outBytesPerStride);
error = gbmapper.lock(buff, buffer->omxBuffer.attr.anwBuffer.usage, rect, &data);
EXPECT_EQ(error, android::NO_ERROR);
if (error != android::NO_ERROR) return 1;