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

Merge "camera2: Fix LEGACY YUV production and orientation." into lmp-mr1-dev

Browse Source
This commit is contained in:
Ruben Brunk
2014-12-11 19:48:36 +00:00
committed by Android (Google) Code Review
parent 7d8ccb41fa 433e715cc0
commit f6ed526b3a
2 changed files with 99 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
core/java/android/hardware/camera2/legacy/SurfaceTextureRenderer.java
View File

@@ -58,6 +58,11 @@ public class SurfaceTextureRenderer {
private static final int GLES_VERSION = 2; private static final int GLES_VERSION = 2;
private static final int PBUFFER_PIXEL_BYTES = 4; private static final int PBUFFER_PIXEL_BYTES = 4;
private static final int FLIP_TYPE_NONE = 0;
private static final int FLIP_TYPE_HORIZONTAL = 1;
private static final int FLIP_TYPE_VERTICAL = 2;
private static final int FLIP_TYPE_BOTH = FLIP_TYPE_HORIZONTAL | FLIP_TYPE_VERTICAL;
private EGLDisplay mEGLDisplay = EGL14.EGL_NO_DISPLAY; private EGLDisplay mEGLDisplay = EGL14.EGL_NO_DISPLAY;
private EGLContext mEGLContext = EGL14.EGL_NO_CONTEXT; private EGLContext mEGLContext = EGL14.EGL_NO_CONTEXT;
private EGLConfig mConfigs; private EGLConfig mConfigs;
@@ -82,8 +87,8 @@ public class SurfaceTextureRenderer {
private static final int TRIANGLE_VERTICES_DATA_POS_OFFSET = 0; private static final int TRIANGLE_VERTICES_DATA_POS_OFFSET = 0;
private static final int TRIANGLE_VERTICES_DATA_UV_OFFSET = 3; private static final int TRIANGLE_VERTICES_DATA_UV_OFFSET = 3;
// Sampling is mirrored across the vertical axis to undo horizontal flip from the front camera // Sampling is mirrored across the horizontal axis
private static final float[] sFrontCameraTriangleVertices = { private static final float[] sHorizontalFlipTriangleVertices = {
// X, Y, Z, U, V // X, Y, Z, U, V
-1.0f, -1.0f, 0, 1.f, 0.f, -1.0f, -1.0f, 0, 1.f, 0.f,
1.0f, -1.0f, 0, 0.f, 0.f, 1.0f, -1.0f, 0, 0.f, 0.f,
@@ -91,8 +96,26 @@ public class SurfaceTextureRenderer {
1.0f, 1.0f, 0, 0.f, 1.f, 1.0f, 1.0f, 0, 0.f, 1.f,
}; };
// Sampling is mirrored across the vertical axis
private static final float[] sVerticalFlipTriangleVertices = {
// X, Y, Z, U, V
-1.0f, -1.0f, 0, 0.f, 1.f,
1.0f, -1.0f, 0, 1.f, 1.f,
-1.0f, 1.0f, 0, 0.f, 0.f,
1.0f, 1.0f, 0, 1.f, 0.f,
};
// Sampling is mirrored across the both axes
private static final float[] sBothFlipTriangleVertices = {
// X, Y, Z, U, V
-1.0f, -1.0f, 0, 1.f, 1.f,
1.0f, -1.0f, 0, 0.f, 1.f,
-1.0f, 1.0f, 0, 1.f, 0.f,
1.0f, 1.0f, 0, 0.f, 0.f,
};
// Sampling is 1:1 for a straight copy for the back camera // Sampling is 1:1 for a straight copy for the back camera
private static final float[] sBackCameraTriangleVertices = { private static final float[] sRegularTriangleVertices = {
// X, Y, Z, U, V // X, Y, Z, U, V
-1.0f, -1.0f, 0, 0.f, 0.f, -1.0f, -1.0f, 0, 0.f, 0.f,
1.0f, -1.0f, 0, 1.f, 0.f, 1.0f, -1.0f, 0, 1.f, 0.f,
@@ -100,7 +123,11 @@ public class SurfaceTextureRenderer {
1.0f, 1.0f, 0, 1.f, 1.f, 1.0f, 1.0f, 0, 1.f, 1.f,
}; };
private FloatBuffer mTriangleVertices; private FloatBuffer mRegularTriangleVertices;
private FloatBuffer mHorizontalFlipTriangleVertices;
private FloatBuffer mVerticalFlipTriangleVertices;
private FloatBuffer mBothFlipTriangleVertices;
private final int mFacing;
/** /**
* As used in this file, this vertex shader maps a unit square to the view, and * As used in this file, this vertex shader maps a unit square to the view, and
@@ -148,15 +175,27 @@ public class SurfaceTextureRenderer {
private static final String LEGACY_PERF_PROPERTY = "persist.camera.legacy_perf"; private static final String LEGACY_PERF_PROPERTY = "persist.camera.legacy_perf";
public SurfaceTextureRenderer(int facing) { public SurfaceTextureRenderer(int facing) {
if (facing == CameraCharacteristics.LENS_FACING_BACK) { mFacing = facing;
mTriangleVertices = ByteBuffer.allocateDirect(sBackCameraTriangleVertices.length *
FLOAT_SIZE_BYTES).order(ByteOrder.nativeOrder()).asFloatBuffer(); mRegularTriangleVertices = ByteBuffer.allocateDirect(sRegularTriangleVertices.length *
mTriangleVertices.put(sBackCameraTriangleVertices).position(0); FLOAT_SIZE_BYTES).order(ByteOrder.nativeOrder()).asFloatBuffer();
} else { mRegularTriangleVertices.put(sRegularTriangleVertices).position(0);
mTriangleVertices = ByteBuffer.allocateDirect(sFrontCameraTriangleVertices.length *
FLOAT_SIZE_BYTES).order(ByteOrder.nativeOrder()).asFloatBuffer(); mHorizontalFlipTriangleVertices = ByteBuffer.allocateDirect(
mTriangleVertices.put(sFrontCameraTriangleVertices).position(0); sHorizontalFlipTriangleVertices.length * FLOAT_SIZE_BYTES).
} order(ByteOrder.nativeOrder()).asFloatBuffer();
mHorizontalFlipTriangleVertices.put(sHorizontalFlipTriangleVertices).position(0);
mVerticalFlipTriangleVertices = ByteBuffer.allocateDirect(
sVerticalFlipTriangleVertices.length * FLOAT_SIZE_BYTES).
order(ByteOrder.nativeOrder()).asFloatBuffer();
mVerticalFlipTriangleVertices.put(sVerticalFlipTriangleVertices).position(0);
mBothFlipTriangleVertices = ByteBuffer.allocateDirect(
sBothFlipTriangleVertices.length * FLOAT_SIZE_BYTES).
order(ByteOrder.nativeOrder()).asFloatBuffer();
mBothFlipTriangleVertices.put(sBothFlipTriangleVertices).position(0);
Matrix.setIdentityM(mSTMatrix, 0); Matrix.setIdentityM(mSTMatrix, 0);
} }
@@ -209,7 +248,7 @@ public class SurfaceTextureRenderer {
return program; return program;
} }
private void drawFrame(SurfaceTexture st, int width, int height) { private void drawFrame(SurfaceTexture st, int width, int height, int flipType) {
checkGlError("onDrawFrame start"); checkGlError("onDrawFrame start");
st.getTransformMatrix(mSTMatrix); st.getTransformMatrix(mSTMatrix);
@@ -266,16 +305,32 @@ public class SurfaceTextureRenderer {
GLES20.glActiveTexture(GLES20.GL_TEXTURE0); GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, mTextureID); GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES, mTextureID);
mTriangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET); FloatBuffer triangleVertices;
switch(flipType) {
case FLIP_TYPE_HORIZONTAL:
triangleVertices = mHorizontalFlipTriangleVertices;
break;
case FLIP_TYPE_VERTICAL:
triangleVertices = mVerticalFlipTriangleVertices;
break;
case FLIP_TYPE_BOTH:
triangleVertices = mBothFlipTriangleVertices;
break;
default:
triangleVertices = mRegularTriangleVertices;
break;
}
triangleVertices.position(TRIANGLE_VERTICES_DATA_POS_OFFSET);
GLES20.glVertexAttribPointer(maPositionHandle, VERTEX_POS_SIZE, GLES20.GL_FLOAT, GLES20.glVertexAttribPointer(maPositionHandle, VERTEX_POS_SIZE, GLES20.GL_FLOAT,
/*normalized*/ false, TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices); /*normalized*/ false, TRIANGLE_VERTICES_DATA_STRIDE_BYTES, triangleVertices);
checkGlError("glVertexAttribPointer maPosition"); checkGlError("glVertexAttribPointer maPosition");
GLES20.glEnableVertexAttribArray(maPositionHandle); GLES20.glEnableVertexAttribArray(maPositionHandle);
checkGlError("glEnableVertexAttribArray maPositionHandle"); checkGlError("glEnableVertexAttribArray maPositionHandle");
mTriangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET); triangleVertices.position(TRIANGLE_VERTICES_DATA_UV_OFFSET);
GLES20.glVertexAttribPointer(maTextureHandle, VERTEX_UV_SIZE, GLES20.GL_FLOAT, GLES20.glVertexAttribPointer(maTextureHandle, VERTEX_UV_SIZE, GLES20.GL_FLOAT,
/*normalized*/ false, TRIANGLE_VERTICES_DATA_STRIDE_BYTES, mTriangleVertices); /*normalized*/ false, TRIANGLE_VERTICES_DATA_STRIDE_BYTES, triangleVertices);
checkGlError("glVertexAttribPointer maTextureHandle"); checkGlError("glVertexAttribPointer maTextureHandle");
GLES20.glEnableVertexAttribArray(maTextureHandle); GLES20.glEnableVertexAttribArray(maTextureHandle);
checkGlError("glEnableVertexAttribArray maTextureHandle"); checkGlError("glEnableVertexAttribArray maTextureHandle");
@@ -666,7 +721,9 @@ public class SurfaceTextureRenderer {
makeCurrent(holder.eglSurface); makeCurrent(holder.eglSurface);
LegacyCameraDevice.setNextTimestamp(holder.surface, captureHolder.second); LegacyCameraDevice.setNextTimestamp(holder.surface, captureHolder.second);
drawFrame(mSurfaceTexture, holder.width, holder.height); drawFrame(mSurfaceTexture, holder.width, holder.height,
(mFacing == CameraCharacteristics.LENS_FACING_FRONT) ?
FLIP_TYPE_HORIZONTAL : FLIP_TYPE_NONE);
swapBuffers(holder.eglSurface); swapBuffers(holder.eglSurface);
} catch (LegacyExceptionUtils.BufferQueueAbandonedException e) { } catch (LegacyExceptionUtils.BufferQueueAbandonedException e) {
Log.w(TAG, "Surface abandoned, dropping frame. ", e); Log.w(TAG, "Surface abandoned, dropping frame. ", e);
@@ -676,7 +733,10 @@ public class SurfaceTextureRenderer {
for (EGLSurfaceHolder holder : mConversionSurfaces) { for (EGLSurfaceHolder holder : mConversionSurfaces) {
if (LegacyCameraDevice.containsSurfaceId(holder.surface, targetSurfaceIds)) { if (LegacyCameraDevice.containsSurfaceId(holder.surface, targetSurfaceIds)) {
makeCurrent(holder.eglSurface); makeCurrent(holder.eglSurface);
drawFrame(mSurfaceTexture, holder.width, holder.height); // glReadPixels reads from the bottom of the buffer, so add an extra vertical flip
drawFrame(mSurfaceTexture, holder.width, holder.height,
(mFacing == CameraCharacteristics.LENS_FACING_FRONT) ?
FLIP_TYPE_BOTH : FLIP_TYPE_VERTICAL);
mPBufferPixels.clear(); mPBufferPixels.clear();
GLES20.glReadPixels(/*x*/ 0, /*y*/ 0, holder.width, holder.height, GLES20.glReadPixels(/*x*/ 0, /*y*/ 0, holder.width, holder.height,
GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, mPBufferPixels); GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, mPBufferPixels);

35
core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
View File

@@ -49,36 +49,35 @@ using namespace android;
#define ALIGN(x, mask) ( ((x) + (mask) - 1) & ~((mask) - 1) ) #define ALIGN(x, mask) ( ((x) + (mask) - 1) & ~((mask) - 1) )
/** /**
* Convert from RGB 888 to Y'CbCr using the conversion specified in ITU-R BT.601 for * Convert from RGB 888 to Y'CbCr using the conversion specified in JFIF v1.02
* digital RGB with K_b = 0.114, and K_r = 0.299.
*/ */
static void rgbToYuv420(uint8_t* rgbBuf, size_t width, size_t height, uint8_t* yPlane, static void rgbToYuv420(uint8_t* rgbBuf, size_t width, size_t height, uint8_t* yPlane,
uint8_t* uPlane, uint8_t* vPlane, size_t chromaStep, size_t yStride, size_t chromaStride) { uint8_t* uPlane, uint8_t* vPlane, size_t chromaStep, size_t yStride, size_t chromaStride) {
uint8_t R, G, B; uint8_t R, G, B;
size_t index = 0; size_t index = 0;
size_t cStrideDiff = chromaStride - width;
for (size_t j = 0; j < height; j++) { for (size_t j = 0; j < height; j++) {
uint8_t* u = uPlane;
uint8_t* v = vPlane;
uint8_t* y = yPlane;
bool jEven = (j & 1) == 0;
for (size_t i = 0; i < width; i++) { for (size_t i = 0; i < width; i++) {
R = rgbBuf[index++]; R = rgbBuf[index++];
G = rgbBuf[index++]; G = rgbBuf[index++];
B = rgbBuf[index++]; B = rgbBuf[index++];
*(yPlane + i) = ((66 * R + 129 * G + 25 * B + 128) >> 8) + 16; *y++ = (77 * R + 150 * G + 29 * B) >> 8;
if (jEven && (i & 1) == 0) {
if (j % 2 == 0 && i % 2 == 0){ *v = (( -43 * R - 85 * G + 128 * B) >> 8) + 128;
*uPlane = (( -38 * R - 74 * G + 112 * B + 128) >> 8) + 128; *u = (( 128 * R - 107 * G - 21 * B) >> 8) + 128;
*vPlane = (( 112 * R - 94 * G - 18 * B + 128) >> 8) + 128; u += chromaStep;
uPlane += chromaStep; v += chromaStep;
vPlane += chromaStep;
} }
// Skip alpha // Skip alpha
index++; index++;
} }
yPlane += yStride; yPlane += yStride;
if (j % 2 == 0) { if (jEven) {
uPlane += cStrideDiff; uPlane += chromaStride;
vPlane += cStrideDiff; vPlane += chromaStride;
} }
} }
} }
@@ -87,8 +86,10 @@ static void rgbToYuv420(uint8_t* rgbBuf, size_t width, size_t height, android_yc
size_t cStep = ycbcr->chroma_step; size_t cStep = ycbcr->chroma_step;
size_t cStride = ycbcr->cstride; size_t cStride = ycbcr->cstride;
size_t yStride = ycbcr->ystride; size_t yStride = ycbcr->ystride;
ALOGV("%s: yStride is: %zu, cStride is: %zu, cStep is: %zu", __FUNCTION__, yStride, cStride,
cStep);
rgbToYuv420(rgbBuf, width, height, reinterpret_cast<uint8_t*>(ycbcr->y), rgbToYuv420(rgbBuf, width, height, reinterpret_cast<uint8_t*>(ycbcr->y),
reinterpret_cast<uint8_t*>(ycbcr->cb), reinterpret_cast<uint8_t*>(ycbcr->cr), reinterpret_cast<uint8_t*>(ycbcr->cr), reinterpret_cast<uint8_t*>(ycbcr->cb),
cStep, yStride, cStride); cStep, yStride, cStride);
} }
@@ -231,6 +232,7 @@ static status_t produceFrame(const sp<ANativeWindow>& anw,
size_t totalSizeBytes = tmpSize; size_t totalSizeBytes = tmpSize;
ALOGV("%s: Pixel format chosen: %x", __FUNCTION__, pixelFmt);
switch(pixelFmt) { switch(pixelFmt) {
case HAL_PIXEL_FORMAT_YCrCb_420_SP: { case HAL_PIXEL_FORMAT_YCrCb_420_SP: {
if (bufferLength < totalSizeBytes) { if (bufferLength < totalSizeBytes) {
@@ -276,6 +278,7 @@ static status_t produceFrame(const sp<ANativeWindow>& anw,
} }
uint32_t stride = buf->getStride(); uint32_t stride = buf->getStride();
ALOGV("%s: stride is: %" PRIu32, __FUNCTION__, stride);
LOG_ALWAYS_FATAL_IF(stride % 16, "Stride is not 16 pixel aligned %d", stride); LOG_ALWAYS_FATAL_IF(stride % 16, "Stride is not 16 pixel aligned %d", stride);
uint32_t cStride = ALIGN(stride / 2, 16); uint32_t cStride = ALIGN(stride / 2, 16);