Move NV21 colorspace treatment from VideoCapture java to C++

media/base/android/java/src/org/chromium/media/VideoCapture.java

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.media;
 
 import android.content.Context;
 import android.graphics.ImageFormat;
 import android.graphics.SurfaceTexture;
 import android.graphics.SurfaceTexture.OnFrameAvailableListener;
@@ skipping 25 matching lines @@
     // To work around the issues on those devices, we'd have to request NV21.
     // This is a temporary hack till device manufacturers fix the problem or
     // we don't need to support those devices any more.
     private static class DeviceImageFormatHack {
         private static final String[] sBUGGY_DEVICE_LIST = {
             "SAMSUNG-SGH-I747",
         };
 
         static int getImageFormat() {
             if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {
+                Log.d(TAG, "NV21 colorspace");
                 return ImageFormat.NV21;
             }
 
             for (String buggyDevice : sBUGGY_DEVICE_LIST) {
                 if (buggyDevice.contentEquals(android.os.Build.MODEL)) {
+                    Log.d(TAG, "NV21 colorspace");
                     return ImageFormat.NV21;
                 }
             }
-
+            Log.d(TAG, "YV12 colorspace");
             return ImageFormat.YV12;
         }
     }
 
     private Camera mCamera;
     public ReentrantLock mPreviewBufferLock = new ReentrantLock();
     private int mImageFormat = ImageFormat.YV12;
     private byte[] mColorPlane = null;
     private Context mContext = null;
     // True when native code has started capture.
@@ skipping 166 matching lines @@
     public int queryHeight() {
         return mCurrentCapability.mHeight;
     }
 
     @CalledByNative
     public int queryFrameRate() {
         return mCurrentCapability.mDesiredFps;
     }
 
     @CalledByNative
+    public int getColorspace() {
+        return mImageFormat;
+    }
+
+    @CalledByNative
     public int startCapture() {
         if (mCamera == null) {
             Log.e(TAG, "startCapture: camera is null");
             return -1;
         }
 
         mPreviewBufferLock.lock();
         try {
             if (mIsRunning) {
                 return 0;
@@ skipping 67 matching lines @@
                 boolean flipVertical = false;
                 boolean flipHorizontal = false;
                 if (mCameraFacing == Camera.CameraInfo.CAMERA_FACING_FRONT) {
                     rotation = (mCameraOrientation + rotation) % 360;
                     rotation = (360 - rotation) % 360;
                     flipHorizontal = (rotation == 270 || rotation == 90);
                     flipVertical = flipHorizontal;
                 } else {
                     rotation = (mCameraOrientation - rotation + 360) % 360;
                 }
-                if (mImageFormat == ImageFormat.NV21) {
-                    convertNV21ToYV12(data);
-                }
                 nativeOnFrameAvailable(mNativeVideoCaptureDeviceAndroid,
                         data, mExpectedFrameSize,
                         rotation, flipVertical, flipHorizontal);
             }
         } finally {
             mPreviewBufferLock.unlock();
             if (camera != null) {
                 camera.addCallbackBuffer(data);
             }
         }
@@ skipping 69 matching lines @@
                 default:
                     orientation = 0;
                     break;
             }
         }
         return orientation;
     }
 
     private void calculateImageFormat(int width, int height) {
         mImageFormat = DeviceImageFormatHack.getImageFormat();
-        if (mImageFormat == ImageFormat.NV21) {
-            mColorPlane = new byte[width * height / 4];
-        }
-    }
-
-    private void convertNV21ToYV12(byte[] data) {
-        final int ySize = mCurrentCapability.mWidth * mCurrentCapability.mHeight;
-        final int uvSize = ySize / 4;
-        for (int i = 0; i < uvSize; i++) {
-            final int index = ySize + i * 2;
-            data[ySize + i] = data[index];
-            mColorPlane[i] = data[index + 1];
-        }
-        System.arraycopy(mColorPlane, 0, data, ySize + uvSize, uvSize);
     }
 }