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

Commit e216948d authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Cleanup of Bitmap.h entry points. 

All Bitmap constructors have been made private and the only way to
create one is through the allocate or createFrom factories.

SkColorSpace is now explicitly passed in to all the factories and is
no longer assumed to be sRGB.

Test: atest CtsGraphicsTestCases
Change-Id: I92c1c5c59df6de7fdd90e9504a2c2717cb854588
parent e51dab22

core/jni/android/graphics/Bitmap.cpp

+9 −9
Original line number Diff line number Diff line
@@ -725,9 +725,10 @@ static jobject Bitmap_createFromParcel(JNIEnv* env, jobject, jobject parcel) { 
            return NULL;

        }



        // Map the pixels in place and take ownership of the ashmem region.

        nativeBitmap = sk_sp<Bitmap>(GraphicsJNI::mapAshmemBitmap(env, bitmap.get(),

                dupFd, const_cast<void*>(blob.data()), size, !isMutable));

        // Map the pixels in place and take ownership of the ashmem region. We must also respect the

        // rowBytes value already set on the bitmap instead of attempting to compute our own.

        nativeBitmap = Bitmap::createFrom(bitmap->info(), bitmap->rowBytes(), dupFd,

                                          const_cast<void*>(blob.data()), size, !isMutable);

        if (!nativeBitmap) {

            close(dupFd);

            blob.release();
@@ -1097,21 +1098,20 @@ static jobject Bitmap_copyPreserveInternalConfig(JNIEnv* env, jobject, jlong bit 
    SkBitmap src;

    hwuiBitmap.getSkBitmap(&src);



    SkBitmap result;

    HeapAllocator allocator;

    if (!bitmapCopyTo(&result, hwuiBitmap.info().colorType(), src, &allocator)) {

    if (src.pixelRef() == nullptr) {

        doThrowRE(env, "Could not copy a hardware bitmap.");

        return NULL;

    }

    return createBitmap(env, allocator.getStorageObjAndReset(), getPremulBitmapCreateFlags(false));



    sk_sp<Bitmap> bitmap = Bitmap::createFrom(src.info(), *src.pixelRef());

    return createBitmap(env, bitmap.release(), getPremulBitmapCreateFlags(false));

}



static jobject Bitmap_createHardwareBitmap(JNIEnv* env, jobject, jobject graphicBuffer) {

    sp<GraphicBuffer> buffer(graphicBufferForJavaObject(env, graphicBuffer));

    // Bitmap::createFrom currently assumes SRGB color space for RGBA images.

    // To support any color space, we need to pass an additional ColorSpace argument to

    // java Bitmap.createHardwareBitmap.

    sk_sp<Bitmap> bitmap = Bitmap::createFrom(buffer);

    sk_sp<Bitmap> bitmap = Bitmap::createFrom(buffer, SkColorSpace::MakeSRGB());

    if (!bitmap.get()) {

        ALOGW("failed to create hardware bitmap from graphic buffer");

        return NULL;

core/jni/android/graphics/Graphics.cpp

+0 −30
Original line number Diff line number Diff line
@@ -424,36 +424,6 @@ jobject GraphicsJNI::createRegion(JNIEnv* env, SkRegion* region) 


///////////////////////////////////////////////////////////////////////////////



android::Bitmap* GraphicsJNI::mapAshmemBitmap(JNIEnv* env, SkBitmap* bitmap,

        int fd, void* addr, size_t size, bool readOnly) {

    const SkImageInfo& info = bitmap->info();

    if (info.colorType() == kUnknown_SkColorType) {

        doThrowIAE(env, "unknown bitmap configuration");

        return nullptr;

    }



    if (!addr) {

        // Map existing ashmem region if not already mapped.

        int flags = readOnly ? (PROT_READ) : (PROT_READ | PROT_WRITE);

        size = ashmem_get_size_region(fd);

        addr = mmap(NULL, size, flags, MAP_SHARED, fd, 0);

        if (addr == MAP_FAILED) {

            return nullptr;

        }

    }



    // we must respect the rowBytes value already set on the bitmap instead of

    // attempting to compute our own.

    const size_t rowBytes = bitmap->rowBytes();



    auto wrapper = new android::Bitmap(addr, fd, size, info, rowBytes);

    wrapper->getSkBitmap(bitmap);

    if (readOnly) {

        bitmap->pixelRef()->setImmutable();

    }

    return wrapper;

}



SkColorSpaceTransferFn GraphicsJNI::getNativeTransferParameters(JNIEnv* env, jobject transferParams) {

    SkColorSpaceTransferFn p;

    p.fA = (float) env->GetDoubleField(transferParams, gTransferParams_aFieldID);

core/jni/android/graphics/GraphicsJNI.h

+0 −3
Original line number Diff line number Diff line
@@ -85,9 +85,6 @@ public: 


    static jobject createBitmapRegionDecoder(JNIEnv* env, SkBitmapRegionDecoder* bitmap);



    static android::Bitmap* mapAshmemBitmap(JNIEnv* env, SkBitmap* bitmap,

            int fd, void* addr, size_t size, bool readOnly);



    /**

     * Given a bitmap we natively allocate a memory block to store the contents

     * of that bitmap.  The memory is then attached to the bitmap via an

core/jni/android_view_ThreadedRenderer.cpp

+4 −6
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 
#include <gui/BufferQueue.h>

#include <gui/Surface.h>



#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <private/EGL/cache.h>



#include <utils/Looper.h>
@@ -58,6 +56,7 @@ 
#include <renderthread/RenderTask.h>

#include <renderthread/RenderThread.h>

#include <pipeline/skia/ShaderCache.h>

#include <utils/Color.h>



namespace android {
@@ -1011,10 +1010,9 @@ static jobject android_view_ThreadedRenderer_createHardwareBitmapFromRenderNode( 
                buffer->getWidth(), buffer->getHeight(), width, height);

        // Continue I guess?

    }

    sk_sp<Bitmap> bitmap = Bitmap::createFrom(buffer);

    // Bitmap::createFrom currently can only attach to a GraphicBuffer with PIXEL_FORMAT_RGBA_8888

    // format and SRGB color space.

    // To support any color space, we could extract it from BufferItem and pass it to Bitmap.



    sk_sp<SkColorSpace> cs = uirenderer::DataSpaceToColorSpace(bufferItem.mDataSpace);

    sk_sp<Bitmap> bitmap = Bitmap::createFrom(buffer, cs);

    return bitmap::createBitmap(env, bitmap.release(),

            android::bitmap::kBitmapCreateFlag_Premultiplied);

}

libs/hwui/HardwareBitmapUploader.cpp

+2 −1
Original line number Diff line number Diff line
@@ -253,7 +253,8 @@ sk_sp<Bitmap> HardwareBitmapUploader::allocateHardwareBitmap(const SkBitmap& sou 
        eglDestroySyncKHR(display, fence);

    }



    return sk_sp<Bitmap>(new Bitmap(buffer.get(), bitmap.info(), Bitmap::computePalette(bitmap)));

    return Bitmap::createFrom(buffer.get(), bitmap.refColorSpace(), bitmap.alphaType(),

                              Bitmap::computePalette(bitmap));

}



}  // namespace android::uirenderer