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

Merge "Attach color space information when attach and queue buffer." into qt-r1-dev

Browse Source
This commit is contained in:
Peiyong Lin
2019-06-27 16:14:02 +00:00
committed by Android (Google) Code Review
parent e1619cb541 ccc06b6f51
commit 964fcdbebd
6 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/java/android/view/Surface.java
View File

@@ -21,6 +21,7 @@ import android.annotation.NonNull;
import android.annotation.UnsupportedAppUsage;
import android.content.res.CompatibilityInfo.Translator;
import android.graphics.Canvas;
import android.graphics.ColorSpace;
import android.graphics.GraphicBuffer;
import android.graphics.Matrix;
import android.graphics.RecordingCanvas;
@@ -80,7 +81,8 @@ public class Surface implements Parcelable {
private static native long nativeGetNextFrameNumber(long nativeObject);
private static native int nativeSetScalingMode(long nativeObject, int scalingMode);
private static native int nativeForceScopedDisconnect(long nativeObject);
private static native int nativeAttachAndQueueBuffer(long nativeObject, GraphicBuffer buffer);
private static native int nativeAttachAndQueueBufferWithColorSpace(long nativeObject,
GraphicBuffer buffer, int colorSpaceId);
private static native int nativeSetSharedBufferModeEnabled(long nativeObject, boolean enabled);
private static native int nativeSetAutoRefreshEnabled(long nativeObject, boolean enabled);
@@ -699,18 +701,35 @@ public class Surface implements Parcelable {
}
/**
* Transfer ownership of buffer with a color space and present it on the Surface.
* The supported color spaces are SRGB and Display P3, other color spaces will be
* treated as SRGB.
* @hide
*/
public void attachAndQueueBufferWithColorSpace(GraphicBuffer buffer, ColorSpace colorSpace) {
synchronized (mLock) {
checkNotReleasedLocked();
if (colorSpace == null) {
colorSpace = ColorSpace.get(ColorSpace.Named.SRGB);
}
int err = nativeAttachAndQueueBufferWithColorSpace(mNativeObject, buffer,
colorSpace.getId());
if (err != 0) {
throw new RuntimeException(
"Failed to attach and queue buffer to Surface (bad object?), "
+ "native error: " + err);
}
}
}
/**
* Deprecated, use attachAndQueueBufferWithColorSpace instead.
* Transfer ownership of buffer and present it on the Surface.
* The color space of the buffer is treated as SRGB.
* @hide
*/
public void attachAndQueueBuffer(GraphicBuffer buffer) {
synchronized (mLock) {
checkNotReleasedLocked();
int err = nativeAttachAndQueueBuffer(mNativeObject, buffer);
if (err != 0) {
throw new RuntimeException(
"Failed to attach and queue buffer to Surface (bad object?)");
}
}
attachAndQueueBufferWithColorSpace(buffer, ColorSpace.get(ColorSpace.Named.SRGB));
}
/**

3
core/java/android/view/SurfaceControl.java
View File

@@ -1866,7 +1866,8 @@ public final class SurfaceControl implements Parcelable {
final ScreenshotGraphicBuffer buffer = screenshotToBuffer(display, sourceCrop, width,
height, useIdentityTransform, rotation);
try {
consumer.attachAndQueueBuffer(buffer.getGraphicBuffer());
consumer.attachAndQueueBufferWithColorSpace(buffer.getGraphicBuffer(),
buffer.getColorSpace());
} catch (RuntimeException e) {
Log.w(TAG, "Failed to take screenshot - " + e.getMessage());
}

28
core/jni/android_view_Surface.cpp
View File

@@ -75,6 +75,24 @@ static struct {
jfieldID bottom;
} gRectClassInfo;
class JNamedColorSpace {
public:
// ColorSpace.Named.SRGB.ordinal() = 0;
static constexpr jint SRGB = 0;
// ColorSpace.Named.DISPLAY_P3.ordinal() = 7;
static constexpr jint DISPLAY_P3 = 7;
};
constexpr ui::Dataspace fromNamedColorSpaceValueToDataspace(const jint colorSpace) {
switch (colorSpace) {
case JNamedColorSpace::DISPLAY_P3:
return ui::Dataspace::DISPLAY_P3;
default:
return ui::Dataspace::V0_SRGB;
}
}
// ----------------------------------------------------------------------------
// this is just a pointer we use to pass to inc/decStrong
@@ -425,11 +443,12 @@ static jint nativeForceScopedDisconnect(JNIEnv *env, jclass clazz, jlong nativeO
return surface->disconnect(-1, IGraphicBufferProducer::DisconnectMode::AllLocal);
}
static jint nativeAttachAndQueueBuffer(JNIEnv *env, jclass clazz, jlong nativeObject,
jobject graphicBuffer) {
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::attachAndQueueBuffer(surface, bp);
int err = Surface::attachAndQueueBufferWithDataspace(surface, bp,
fromNamedColorSpaceValueToDataspace(colorSpaceId));
return err;
}
@@ -531,7 +550,8 @@ static const JNINativeMethod gSurfaceMethods[] = {
{"nativeGetNextFrameNumber", "(J)J", (void*)nativeGetNextFrameNumber },
{"nativeSetScalingMode", "(JI)I", (void*)nativeSetScalingMode },
{"nativeForceScopedDisconnect", "(J)I", (void*)nativeForceScopedDisconnect},
{"nativeAttachAndQueueBuffer", "(JLandroid/graphics/GraphicBuffer;)I", (void*)nativeAttachAndQueueBuffer},
{"nativeAttachAndQueueBufferWithColorSpace", "(JLandroid/graphics/GraphicBuffer;I)I",
(void*)nativeAttachAndQueueBufferWithColorSpace},
{"nativeSetSharedBufferModeEnabled", "(JZ)I", (void*)nativeSetSharedBufferModeEnabled},
{"nativeSetAutoRefreshEnabled", "(JZ)I", (void*)nativeSetAutoRefreshEnabled},

3
services/core/java/com/android/server/wm/ScreenRotationAnimation.java
View File

@@ -279,7 +279,8 @@ class ScreenRotationAnimation {
mService.mDisplayManagerInternal.screenshot(displayId);
if (gb != null) {
try {
surface.attachAndQueueBuffer(gb.getGraphicBuffer());
surface.attachAndQueueBufferWithColorSpace(gb.getGraphicBuffer(),
gb.getColorSpace());
} catch (RuntimeException e) {
Slog.w(TAG, "Failed to attach screenshot - " + e.getMessage());
}

2
services/core/java/com/android/server/wm/TaskScreenshotAnimatable.java
View File

@@ -69,7 +69,7 @@ class TaskScreenshotAnimatable implements SurfaceAnimator.Animatable {
if (buffer != null) {
final Surface surface = new Surface();
surface.copyFrom(mSurfaceControl);
surface.attachAndQueueBuffer(buffer);
surface.attachAndQueueBufferWithColorSpace(buffer, screenshotBuffer.getColorSpace());
surface.release();
}
getPendingTransaction().show(mSurfaceControl);

15
services/core/java/com/android/server/wm/TaskSnapshotSurface.java
View File

@@ -284,7 +284,6 @@ class TaskSnapshotSurface implements StartingSurface {
}
private void drawSnapshot() {
final GraphicBuffer buffer = mSnapshot.getSnapshot();
mSurface.copyFrom(mSurfaceControl);
if (DEBUG_STARTING_WINDOW) Slog.v(TAG, "Drawing snapshot surface sizeMismatch="
@@ -293,9 +292,9 @@ class TaskSnapshotSurface implements StartingSurface {
// The dimensions of the buffer and the window don't match, so attaching the buffer
// will fail. Better create a child window with the exact dimensions and fill the parent
// window with the background color!
drawSizeMismatchSnapshot(buffer);
drawSizeMismatchSnapshot();
} else {
drawSizeMatchSnapshot(buffer);
drawSizeMatchSnapshot();
}
synchronized (mService.mGlobalLock) {
mShownTime = SystemClock.uptimeMillis();
@@ -307,15 +306,17 @@ class TaskSnapshotSurface implements StartingSurface {
mSnapshot = null;
}
private void drawSizeMatchSnapshot(GraphicBuffer buffer) {
mSurface.attachAndQueueBuffer(buffer);
private void drawSizeMatchSnapshot() {
mSurface.attachAndQueueBufferWithColorSpace(mSnapshot.getSnapshot(),
mSnapshot.getColorSpace());
mSurface.release();
}
private void drawSizeMismatchSnapshot(GraphicBuffer buffer) {
private void drawSizeMismatchSnapshot() {
if (!mSurface.isValid()) {
throw new IllegalStateException("mSurface does not hold a valid surface.");
}
final GraphicBuffer buffer = mSnapshot.getSnapshot();
final SurfaceSession session = new SurfaceSession();
// We consider nearly matched dimensions as there can be rounding errors and the user won't
// notice very minute differences from scaling one dimension more than the other
@@ -355,7 +356,7 @@ class TaskSnapshotSurface implements StartingSurface {
} finally {
SurfaceControl.closeTransaction();
}
surface.attachAndQueueBuffer(buffer);
surface.attachAndQueueBufferWithColorSpace(buffer, mSnapshot.getColorSpace());
surface.release();
if (aspectRatioMismatch) {