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

Merge "Merge "ImageWriter: Attach non-opaque Images as well." into oc-dev am: 97258cd731" into oc-dev-plus-aosp

Browse Source
This commit is contained in:
Android Build Merger (Role)
2017-05-05 16:20:19 +00:00
committed by Android (Google) Code Review
parent 1c5c8a4a3b e7bb0cf0f6
commit 74d76f406b
3 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/ImageReader.java
View File

@@ -705,6 +705,8 @@ public class ImageReader implements AutoCloseable {
}
nativeDetachImage(image);
si.clearSurfacePlanes();
si.mPlanes = null;
si.setDetached(true);
}

30
media/java/android/media/ImageWriter.java
View File

@@ -359,28 +359,14 @@ public class ImageWriter implements AutoCloseable {
}
ImageReader prevOwner = (ImageReader) image.getOwner();
// Only do the image attach for PRIVATE format images for now. Do the image
// copy for other formats. TODO: use attach for other formats to
// improve the performance, and fall back to copy when attach/detach
// fails. Right now, detach is guaranteed to fail as the buffer is
// locked when ImageReader#acquireNextImage is called. See bug 19962027.
if (image.getFormat() == ImageFormat.PRIVATE) {
prevOwner.detachImage(image);
attachAndQueueInputImage(image);
// This clears the native reference held by the original owner.
// When this Image is detached later by this ImageWriter, the
// native memory won't be leaked.
image.close();
return;
} else {
Image inputImage = dequeueInputImage();
inputImage.setTimestamp(image.getTimestamp());
inputImage.setCropRect(image.getCropRect());
ImageUtils.imageCopy(image, inputImage);
image.close();
image = inputImage;
ownedByMe = true;
}
prevOwner.detachImage(image);
attachAndQueueInputImage(image);
// This clears the native reference held by the original owner.
// When this Image is detached later by this ImageWriter, the
// native memory won't be leaked.
image.close();
return;
}
Rect crop = image.getCropRect();

20
media/jni/android_media_ImageWriter.cpp
View File

@@ -499,30 +499,23 @@ static jint ImageWriter_attachAndQueueImage(JNIEnv* env, jobject thiz, jlong nat
sp<Surface> surface = ctx->getProducer();
status_t res = OK;
if (!isFormatOpaque(imageFormat)) {
// TODO: need implement, see b/19962027
jniThrowRuntimeException(env,
"nativeAttachImage for non-opaque image is not implement yet!!!");
return -1;
}
if (!isFormatOpaque(ctx->getBufferFormat())) {
if (isFormatOpaque(imageFormat) != isFormatOpaque(ctx->getBufferFormat())) {
jniThrowException(env, "java/lang/IllegalStateException",
"Trying to attach an opaque image into a non-opaque ImageWriter");
"Trying to attach an opaque image into a non-opaque ImageWriter, or vice versa");
return -1;
}
// Image is guaranteed to be from ImageReader at this point, so it is safe to
// cast to BufferItem pointer.
BufferItem* opaqueBuffer = reinterpret_cast<BufferItem*>(nativeBuffer);
if (opaqueBuffer == NULL) {
BufferItem* buffer = reinterpret_cast<BufferItem*>(nativeBuffer);
if (buffer == NULL) {
jniThrowException(env, "java/lang/IllegalStateException",
"Image is not initialized or already closed");
return -1;
}
// Step 1. Attach Image
res = surface->attachBuffer(opaqueBuffer->mGraphicBuffer.get());
res = surface->attachBuffer(buffer->mGraphicBuffer.get());
if (res != OK) {
ALOGE("Attach image failed: %s (%d)", strerror(-res), res);
switch (res) {
@@ -559,7 +552,7 @@ static jint ImageWriter_attachAndQueueImage(JNIEnv* env, jobject thiz, jlong nat
}
// Step 3. Queue Image.
res = anw->queueBuffer(anw.get(), opaqueBuffer->mGraphicBuffer.get(), /*fenceFd*/
res = anw->queueBuffer(anw.get(), buffer->mGraphicBuffer.get(), /*fenceFd*/
-1);
if (res != OK) {
ALOGE("%s: Queue buffer failed: %s (%d)", __FUNCTION__, strerror(-res), res);
@@ -817,4 +810,3 @@ int register_android_media_ImageWriter(JNIEnv *env) {
return (ret1 || ret2);
}