Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move GraphicBuffer back into libandroid_runtime."

Browse Source
This commit is contained in:
Derek Sollenberger
2019-08-12 12:38:51 +00:00
committed by Android (Google) Code Review
parent bb748c592b e78f7c9f48
commit 19419ccc95
15 changed files with 114 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/Android.bp
View File

@@ -104,6 +104,7 @@ cc_library_shared {
"android_database_SQLiteConnection.cpp",
"android_database_SQLiteGlobal.cpp",
"android_database_SQLiteDebug.cpp",
"android_graphics_GraphicBuffer.cpp",
"android_view_CompositionSamplingListener.cpp",
"android_view_DisplayEventReceiver.cpp",
"android_view_InputChannel.cpp",
@@ -421,7 +422,6 @@ cc_library_static {
"android_view_ThreadedRenderer.cpp",
"android/graphics/BitmapRegionDecoder.cpp",
"android/graphics/GIFMovie.cpp",
"android/graphics/GraphicBuffer.cpp",
"android/graphics/Movie.cpp",
"android/graphics/MovieImpl.cpp",
"android/graphics/SurfaceTexture.cpp",

16
core/jni/android/graphics/Bitmap.cpp
View File

@@ -19,11 +19,10 @@
#include <utils/Color.h>
#ifdef __ANDROID__ // Layoutlib does not support graphic buffer, parcel or render thread
#include "GraphicBuffer.h"
#include <binder/Parcel.h>
#include <renderthread/RenderProxy.h>
#include <android_runtime/android_graphics_GraphicBuffer.h>
#include <android_runtime/android_hardware_HardwareBuffer.h>
#include <private/android/AHardwareBufferHelpers.h>
#endif
@@ -1129,12 +1128,10 @@ static jobject Bitmap_copyPreserveInternalConfig(JNIEnv* env, jobject, jlong bit
static jobject Bitmap_wrapHardwareBufferBitmap(JNIEnv* env, jobject, jobject hardwareBuffer,
jlong colorSpacePtr) {
#ifdef __ANDROID__ // Layoutlib does not support graphic buffer
AHardwareBuffer* hwBuf = android_hardware_HardwareBuffer_getNativeHardwareBuffer(env,
AHardwareBuffer* buffer = android_hardware_HardwareBuffer_getNativeHardwareBuffer(env,
hardwareBuffer);
sp<GraphicBuffer> buffer(AHardwareBuffer_to_GraphicBuffer(hwBuf));
SkColorType ct = uirenderer::PixelFormatToColorType(buffer->getPixelFormat());
sk_sp<Bitmap> bitmap = Bitmap::createFrom(buffer, ct,
GraphicsJNI::getNativeColorSpace(colorSpacePtr));
sk_sp<Bitmap> bitmap = Bitmap::createFrom(buffer,
GraphicsJNI::getNativeColorSpace(colorSpacePtr));
if (!bitmap.get()) {
ALOGW("failed to create hardware bitmap from hardware buffer");
return NULL;
@@ -1151,9 +1148,8 @@ static jobject Bitmap_createGraphicBufferHandle(JNIEnv* env, jobject, jlong bitm
LOG_ALWAYS_FATAL_IF(!bitmapHandle->isHardware(),
"Hardware config is only supported config in Bitmap_getGraphicBuffer");
Bitmap& hwuiBitmap = bitmapHandle->bitmap();
sp<GraphicBuffer> buffer(hwuiBitmap.graphicBuffer());
return createJavaGraphicBuffer(env, buffer);
Bitmap& bitmap = bitmapHandle->bitmap();
return android_graphics_GraphicBuffer_createFromAHardwareBuffer(env, bitmap.hardwareBuffer());
#else
return NULL;
#endif

10
core/jni/android/graphics/GraphicBuffer.cpp → core/jni/android_graphics_GraphicBuffer.cpp
View File

@@ -21,10 +21,10 @@
#include <inttypes.h>
#include "android_os_Parcel.h"
#include "GraphicBuffer.h"
#include "GraphicsJNI.h"
#include "android/graphics/GraphicsJNI.h"
#include <android_runtime/AndroidRuntime.h>
#include <android_runtime/android_graphics_GraphicBuffer.h>
#include <binder/Parcel.h>
@@ -266,7 +266,7 @@ static jlong android_graphics_GraphicBuffer_read(JNIEnv* env, jobject clazz,
// External helpers
// ----------------------------------------------------------------------------
sp<GraphicBuffer> graphicBufferForJavaObject(JNIEnv* env, jobject obj) {
sp<GraphicBuffer> android_graphics_GraphicBuffer_getNativeGraphicsBuffer(JNIEnv* env, jobject obj) {
if (obj) {
jlong nativeObject = env->GetLongField(obj, gGraphicBufferClassInfo.mNativeObject);
GraphicBufferWrapper* wrapper = (GraphicBufferWrapper*) nativeObject;
@@ -278,7 +278,9 @@ sp<GraphicBuffer> graphicBufferForJavaObject(JNIEnv* env, jobject obj) {
return NULL;
}
jobject createJavaGraphicBuffer(JNIEnv* env, const sp<GraphicBuffer>& buffer) {
jobject android_graphics_GraphicBuffer_createFromAHardwareBuffer(JNIEnv* env,
AHardwareBuffer* hardwareBuffer) {
GraphicBuffer* buffer = GraphicBuffer::fromAHardwareBuffer(hardwareBuffer);
GraphicBufferWrapper* wrapper = new GraphicBufferWrapper(buffer);
jobject obj = env->NewObject(gGraphicBufferClassInfo.mClass,
gGraphicBufferClassInfo.mConstructorMethodID, buffer->getWidth(), buffer->getHeight(),

5
core/jni/android_hardware_HardwareBuffer.cpp
View File

@@ -20,9 +20,9 @@
#include <nativehelper/JNIHelp.h>
#include "android_os_Parcel.h"
#include "android/graphics/GraphicBuffer.h"
#include <android/hardware_buffer.h>
#include <android_runtime/android_graphics_GraphicBuffer.h>
#include <android_runtime/android_hardware_HardwareBuffer.h>
#include <android_runtime/AndroidRuntime.h>
#include <android_runtime/Log.h>
@@ -97,7 +97,8 @@ static jlong android_hardware_HardwareBuffer_create(JNIEnv* env, jobject clazz,
}
static jlong android_hardware_HardwareBuffer_createFromGraphicBuffer(JNIEnv* env, jobject clazz, jobject graphicBuffer) {
sp<GraphicBuffer> buffer(graphicBufferForJavaObject(env, graphicBuffer));
sp<GraphicBuffer> buffer(android_graphics_GraphicBuffer_getNativeGraphicsBuffer(env,
graphicBuffer));
GraphicBufferWrapper* wrapper = new GraphicBufferWrapper(buffer);
return reinterpret_cast<jlong>(wrapper);
}

10
core/jni/android_view_Surface.cpp
View File

@@ -21,12 +21,12 @@
#include "jni.h"
#include <nativehelper/JNIHelp.h>
#include "android_os_Parcel.h"
#include "android/graphics/GraphicBuffer.h"
#include "android/graphics/GraphicsJNI.h"
#include "core_jni_helpers.h"
#include <android_runtime/android_view_Surface.h>
#include <android_runtime/android_graphics_GraphicBuffer.h>
#include <android_runtime/android_graphics_SurfaceTexture.h>
#include <android_runtime/android_view_Surface.h>
#include <android_runtime/Log.h>
#include <binder/Parcel.h>
@@ -35,6 +35,7 @@
#include <gui/view/Surface.h>
#include <gui/SurfaceControl.h>
#include <ui/GraphicBuffer.h>
#include <ui/Rect.h>
#include <ui/Region.h>
@@ -432,8 +433,9 @@ static jint nativeForceScopedDisconnect(JNIEnv *env, jclass clazz, jlong nativeO
static jint nativeAttachAndQueueBufferWithColorSpace(JNIEnv *env, jclass clazz, jlong nativeObject,
jobject graphicBuffer, jint colorSpaceId) {
Surface* surface = reinterpret_cast<Surface*>(nativeObject);
sp<GraphicBuffer> bp = graphicBufferForJavaObject(env, graphicBuffer);
int err = Surface::attachAndQueueBufferWithDataspace(surface, bp,
sp<GraphicBuffer> gb(android_graphics_GraphicBuffer_getNativeGraphicsBuffer(env,
graphicBuffer));
int err = Surface::attachAndQueueBufferWithDataspace(surface, gb,
fromNamedColorSpaceValueToDataspace(colorSpaceId));
return err;
}

3
core/jni/android_view_ThreadedRenderer.cpp
View File

@@ -520,14 +520,13 @@ static jobject android_view_ThreadedRenderer_createHardwareBitmapFromRenderNode(
// Continue I guess?
}
SkColorType ct = uirenderer::PixelFormatToColorType(buffer->getPixelFormat());
sk_sp<SkColorSpace> cs = uirenderer::DataSpaceToColorSpace(bufferItem.mDataSpace);
if (cs == nullptr) {
// nullptr is treated as SRGB in Skia, thus explicitly use SRGB in order to make sure
// the returned bitmap has a color space.
cs = SkColorSpace::MakeSRGB();
}
sk_sp<Bitmap> bitmap = Bitmap::createFrom(buffer, ct, cs);
sk_sp<Bitmap> bitmap = Bitmap::createFrom(buffer->toAHardwareBuffer(), cs);
return bitmap::createBitmap(env, bitmap.release(),
android::bitmap::kBitmapCreateFlag_Premultiplied);
}

9
core/jni/android/graphics/GraphicBuffer.h → core/jni/include/android_runtime/android_graphics_GraphicBuffer.h
View File

@@ -14,16 +14,19 @@
* limitations under the License.
*/
#include <ui/GraphicBuffer.h>
#include <android/hardware_buffer.h>
#include "jni.h"
namespace android {
class GraphicBuffer;
// This function does not perform any type checking, the specified
// object must be an instance of android.view.GraphicBuffer
extern sp<GraphicBuffer> graphicBufferForJavaObject(JNIEnv* env, jobject obj);
sp<GraphicBuffer> android_graphics_GraphicBuffer_getNativeGraphicsBuffer(JNIEnv* env, jobject obj);
jobject createJavaGraphicBuffer(JNIEnv* env, const sp<GraphicBuffer>& buffer);
extern jobject android_graphics_GraphicBuffer_createFromAHardwareBuffer(JNIEnv* env,
AHardwareBuffer* buffer);
}

1
libs/hwui/Android.bp
View File

@@ -88,6 +88,7 @@ cc_defaults {
"libvulkan",
"libui",
"libgui",
"libnativewindow",
"libprotobuf-cpp-lite",
"libft2",
"libandroidfw",

5
libs/hwui/HardwareBitmapUploader.cpp
View File

@@ -403,8 +403,9 @@ sk_sp<Bitmap> HardwareBitmapUploader::allocateHardwareBitmap(const SkBitmap& sou
if (!sUploader->uploadHardwareBitmap(bitmap, format, buffer)) {
return nullptr;
}
return Bitmap::createFrom(buffer, bitmap.colorType(), bitmap.refColorSpace(),
bitmap.alphaType(), Bitmap::computePalette(bitmap));
return Bitmap::createFrom(buffer->toAHardwareBuffer(), bitmap.colorType(),
bitmap.refColorSpace(), bitmap.alphaType(),
Bitmap::computePalette(bitmap));
}
void HardwareBitmapUploader::initialize() {

35
libs/hwui/hwui/Bitmap.cpp
View File

@@ -148,12 +148,26 @@ sk_sp<Bitmap> Bitmap::createFrom(const SkImageInfo& info, SkPixelRef& pixelRef)
#ifdef __ANDROID__ // Layoutlib does not support hardware acceleration
sk_sp<Bitmap> Bitmap::createFrom(sp<GraphicBuffer> graphicBuffer, SkColorType colorType,
sk_sp<Bitmap> Bitmap::createFrom(AHardwareBuffer* hardwareBuffer, sk_sp<SkColorSpace> colorSpace,
BitmapPalette palette) {
AHardwareBuffer_Desc bufferDesc;
AHardwareBuffer_describe(hardwareBuffer, &bufferDesc);
SkImageInfo info = uirenderer::BufferDescriptionToImageInfo(bufferDesc, colorSpace);
const size_t rowBytes = info.bytesPerPixel() * bufferDesc.stride;
return sk_sp<Bitmap>(new Bitmap(hardwareBuffer, info, rowBytes, palette));
}
sk_sp<Bitmap> Bitmap::createFrom(AHardwareBuffer* hardwareBuffer, SkColorType colorType,
sk_sp<SkColorSpace> colorSpace, SkAlphaType alphaType,
BitmapPalette palette) {
SkImageInfo info = SkImageInfo::Make(graphicBuffer->getWidth(), graphicBuffer->getHeight(),
AHardwareBuffer_Desc bufferDesc;
AHardwareBuffer_describe(hardwareBuffer, &bufferDesc);
SkImageInfo info = SkImageInfo::Make(bufferDesc.width, bufferDesc.height,
colorType, alphaType, colorSpace);
return sk_sp<Bitmap>(new Bitmap(graphicBuffer.get(), info, palette));
const size_t rowBytes = info.bytesPerPixel() * bufferDesc.stride;
return sk_sp<Bitmap>(new Bitmap(hardwareBuffer, info, rowBytes, palette));
}
#endif
@@ -238,18 +252,17 @@ Bitmap::Bitmap(void* address, int fd, size_t mappedSize, const SkImageInfo& info
}
#ifdef __ANDROID__ // Layoutlib does not support hardware acceleration
Bitmap::Bitmap(GraphicBuffer* buffer, const SkImageInfo& info, BitmapPalette palette)
: SkPixelRef(info.width(), info.height(), nullptr,
bytesPerPixel(buffer->getPixelFormat()) * buffer->getStride())
Bitmap::Bitmap(AHardwareBuffer* buffer, const SkImageInfo& info, size_t rowBytes,
BitmapPalette palette)
: SkPixelRef(info.width(), info.height(), nullptr, rowBytes)
, mInfo(validateAlpha(info))
, mPixelStorageType(PixelStorageType::Hardware)
, mPalette(palette)
, mPaletteGenerationId(getGenerationID()) {
mPixelStorage.hardware.buffer = buffer;
buffer->incStrong(buffer);
AHardwareBuffer_acquire(buffer);
setImmutable(); // HW bitmaps are always immutable
mImage = SkImage::MakeFromAHardwareBuffer(reinterpret_cast<AHardwareBuffer*>(buffer),
mInfo.alphaType(), mInfo.refColorSpace());
mImage = SkImage::MakeFromAHardwareBuffer(buffer, mInfo.alphaType(), mInfo.refColorSpace());
}
#endif
@@ -274,7 +287,7 @@ Bitmap::~Bitmap() {
case PixelStorageType::Hardware:
#ifdef __ANDROID__ // Layoutlib does not support hardware acceleration
auto buffer = mPixelStorage.hardware.buffer;
buffer->decStrong(buffer);
AHardwareBuffer_release(buffer);
mPixelStorage.hardware.buffer = nullptr;
#endif
break;
@@ -352,7 +365,7 @@ void Bitmap::getBounds(SkRect* bounds) const {
}
#ifdef __ANDROID__ // Layoutlib does not support hardware acceleration
GraphicBuffer* Bitmap::graphicBuffer() {
AHardwareBuffer* Bitmap::hardwareBuffer() {
if (isHardware()) {
return mPixelStorage.hardware.buffer;
}

19
libs/hwui/hwui/Bitmap.h
View File

@@ -24,7 +24,7 @@
#include <SkPixelRef.h>
#include <cutils/compiler.h>
#ifdef __ANDROID__ // Layoutlib does not support hardware acceleration
#include <ui/GraphicBuffer.h>
#include <android/hardware_buffer.h>
#endif
namespace android {
@@ -74,11 +74,15 @@ public:
* memory that is provided as an input param.
*/
#ifdef __ANDROID__ // Layoutlib does not support hardware acceleration
static sk_sp<Bitmap> createFrom(sp<GraphicBuffer> graphicBuffer,
static sk_sp<Bitmap> createFrom(AHardwareBuffer* hardwareBuffer,
sk_sp<SkColorSpace> colorSpace,
BitmapPalette palette = BitmapPalette::Unknown);
static sk_sp<Bitmap> createFrom(AHardwareBuffer* hardwareBuffer,
SkColorType colorType,
sk_sp<SkColorSpace> colorSpace,
SkAlphaType alphaType = kPremul_SkAlphaType,
BitmapPalette palette = BitmapPalette::Unknown);
SkAlphaType alphaType,
BitmapPalette palette);
#endif
static sk_sp<Bitmap> createFrom(const SkImageInfo& info, size_t rowBytes, int fd, void* addr,
size_t size, bool readOnly);
@@ -110,7 +114,7 @@ public:
PixelStorageType pixelStorageType() const { return mPixelStorageType; }
#ifdef __ANDROID__ // Layoutlib does not support hardware acceleration
GraphicBuffer* graphicBuffer();
AHardwareBuffer* hardwareBuffer();
#endif
/**
@@ -143,7 +147,8 @@ private:
size_t rowBytes);
Bitmap(void* address, int fd, size_t mappedSize, const SkImageInfo& info, size_t rowBytes);
#ifdef __ANDROID__ // Layoutlib does not support hardware acceleration
Bitmap(GraphicBuffer* buffer, const SkImageInfo& info, BitmapPalette palette);
Bitmap(AHardwareBuffer* buffer, const SkImageInfo& info, size_t rowBytes,
BitmapPalette palette);
#endif
virtual ~Bitmap();
@@ -175,7 +180,7 @@ private:
} heap;
#ifdef __ANDROID__ // Layoutlib does not support hardware acceleration
struct {
GraphicBuffer* buffer;
AHardwareBuffer* buffer;
} hardware;
#endif
} mPixelStorage;

1
libs/hwui/renderthread/VulkanSurface.h
View File

@@ -18,6 +18,7 @@
#include <system/graphics.h>
#include <system/window.h>
#include <ui/BufferQueueDefs.h>
#include <ui/PixelFormat.h>
#include <vulkan/vulkan.h>
#include <SkRefCnt.h>

2
libs/hwui/tests/common/scenes/HwBitmapInCompositeShader.cpp
View File

@@ -50,7 +50,7 @@ public:
pixels[4000 + 4 * i + 3] = 255;
}
buffer->unlock();
sk_sp<Bitmap> hardwareBitmap(Bitmap::createFrom(buffer, kRGBA_8888_SkColorType,
sk_sp<Bitmap> hardwareBitmap(Bitmap::createFrom(buffer->toAHardwareBuffer(),
SkColorSpace::MakeSRGB()));
sk_sp<SkShader> hardwareShader(createBitmapShader(*hardwareBitmap));

38
libs/hwui/utils/Color.cpp
View File

@@ -19,12 +19,50 @@
#include <utils/Log.h>
#include <ui/ColorSpace.h>
#ifdef __ANDROID__ // Layoutlib does not support hardware buffers or native windows
#include <android/hardware_buffer.h>
#endif
#include <algorithm>
#include <cmath>
namespace android {
namespace uirenderer {
#ifdef __ANDROID__ // Layoutlib does not support hardware buffers or native windows
SkImageInfo BufferDescriptionToImageInfo(const AHardwareBuffer_Desc& bufferDesc,
sk_sp<SkColorSpace> colorSpace) {
SkColorType colorType = kUnknown_SkColorType;
SkAlphaType alphaType = kOpaque_SkAlphaType;
switch (bufferDesc.format) {
case AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM:
colorType = kN32_SkColorType;
alphaType = kPremul_SkAlphaType;
break;
case AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM:
colorType = kN32_SkColorType;
alphaType = kOpaque_SkAlphaType;
break;
case AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM:
colorType = kRGB_565_SkColorType;
alphaType = kOpaque_SkAlphaType;
break;
case AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM:
colorType = kRGBA_1010102_SkColorType;
alphaType = kPremul_SkAlphaType;
break;
case AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT:
colorType = kRGBA_F16_SkColorType;
alphaType = kPremul_SkAlphaType;
break;
default:
ALOGV("Unsupported format: %d, return unknown by default", bufferDesc.format);
break;
}
return SkImageInfo::Make(bufferDesc.width, bufferDesc.height, colorType, alphaType, colorSpace);
}
#endif
android::PixelFormat ColorTypeToPixelFormat(SkColorType colorType) {
switch (colorType) {
case kRGBA_8888_SkColorType:

5
libs/hwui/utils/Color.h
View File

@@ -25,6 +25,8 @@
#include <SkColorSpace.h>
#include <SkImageInfo.h>
struct AHardwareBuffer_Desc;
namespace android {
namespace uirenderer {
namespace Color {
@@ -89,6 +91,9 @@ static constexpr float EOCF_sRGB(float srgb) {
return srgb <= 0.04045f ? srgb / 12.92f : powf((srgb + 0.055f) / 1.055f, 2.4f);
}
SkImageInfo BufferDescriptionToImageInfo(const AHardwareBuffer_Desc& bufferDesc,
sk_sp<SkColorSpace> colorSpace);
android::PixelFormat ColorTypeToPixelFormat(SkColorType colorType);
ANDROID_API SkColorType PixelFormatToColorType(android::PixelFormat format);