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

Commit e5ed688e authored by Jooyung Han's avatar Jooyung Han Committed by android-build-merger
Browse files

Merge "Use libnativewindow's AHardwareBuffer directly" 

am: d3a512cb

Change-Id: I48ecb7c0b50966362c9e0e2cd69b31b808657893
parents 5f8b3866 d3a512cb

media/ndk/NdkImage.cpp

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "NdkImageReaderPriv.h"



#include <android_media_Utils.h>

#include <android_runtime/android_hardware_HardwareBuffer.h>

#include <private/android/AHardwareBufferHelpers.h>

#include <utils/Log.h>

#include "hardware/camera3.h"
@@ -190,7 +190,7 @@ media_status_t AImage::lockImage() { 


    auto lockedBuffer = std::make_unique<CpuConsumer::LockedBuffer>();



    uint64_t grallocUsage = android_hardware_HardwareBuffer_convertToGrallocUsageBits(mUsage);

    uint64_t grallocUsage = AHardwareBuffer_convertToGrallocUsageBits(mUsage);



    status_t ret =

            lockImageFromBuffer(mBuffer, grallocUsage, mBuffer->mFence->dup(), lockedBuffer.get());

media/ndk/NdkImageReader.cpp

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <utils/Log.h>

#include <android_media_Utils.h>

#include <android_runtime/android_view_Surface.h>

#include <android_runtime/android_hardware_HardwareBuffer.h>

#include <private/android/AHardwareBufferHelpers.h>

#include <grallocusage/GrallocUsageConversion.h>



using namespace android;
@@ -263,7 +263,7 @@ AImageReader::init() { 
    PublicFormat publicFormat = static_cast<PublicFormat>(mFormat);

    mHalFormat = android_view_Surface_mapPublicFormatToHalFormat(publicFormat);

    mHalDataSpace = android_view_Surface_mapPublicFormatToHalDataspace(publicFormat);

    mHalUsage = android_hardware_HardwareBuffer_convertToGrallocUsageBits(mUsage);

    mHalUsage = AHardwareBuffer_convertToGrallocUsageBits(mUsage);



    sp<IGraphicBufferProducer> gbProducer;

    sp<IGraphicBufferConsumer> gbConsumer;