Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bab2268f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Don't query unused values" into main

parents 476134b7 0183e379

automotive/evs/aidl/impl/default/src/EvsVideoEmulatedCamera.cpp

+1 −2
Original line number Diff line number Diff line
@@ -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) {

media/omx/1.0/vts/functional/video/VtsHalMediaOmxV1_0TargetVideoEncTest.cpp

+1 −4
Original line number Diff line number Diff line
@@ -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;