Android VideoCapture : Use NV21 instead of YUV12 and clean up.

talk/app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 53 matching lines @@
 
   public static class CaptureFormat {
     public final int width;
     public final int height;
     public final int maxFramerate;
     public final int minFramerate;
     // TODO(hbos): If VideoCapturerAndroid.startCapture is updated to support
     // other image formats then this needs to be updated and
     // VideoCapturerAndroid.getSupportedFormats need to return CaptureFormats of
     // all imageFormats.
-    public final int imageFormat = ImageFormat.YV12;
+    public final int imageFormat = ImageFormat.NV21;
 
     public CaptureFormat(int width, int height, int minFramerate,
         int maxFramerate) {
       this.width = width;
       this.height = height;
       this.minFramerate = minFramerate;
       this.maxFramerate = maxFramerate;
     }
 
     // Calculates the frame size of this capture format.
     public int frameSize() {
       return frameSize(width, height, imageFormat);
     }
 
     // Calculates the frame size of the specified image format. Currently only
-    // supporting ImageFormat.YV12. The YV12's stride is the closest rounded up
-    // multiple of 16 of the width and width and height are always even.
-    // Android guarantees this:
-    // http://developer.android.com/reference/android/hardware/Camera.Parameters.html#setPreviewFormat%28int%29
+    // supporting ImageFormat.NV21.
+    // The size is width * height * number of bytes per pixel.
+    // http://developer.android.com/reference/android/hardware/Camera.html#addCallbackBuffer(byte[])
     public static int frameSize(int width, int height, int imageFormat) {
-      if (imageFormat != ImageFormat.YV12) {
+      if (imageFormat != ImageFormat.NV21) {
         throw new UnsupportedOperationException("Don't know how to calculate "
-            + "the frame size of non-YV12 image formats.");
+            + "the frame size of non-NV21 image formats.");
       }
-      int yStride = roundUp(width, 16);
-      int uvStride = roundUp(yStride / 2, 16);
-      int ySize = yStride * height;
-      int uvSize = uvStride * height / 2;
-      return ySize + uvSize * 2;
-    }
-
-    // Rounds up |x| to the closest value that is a multiple of |alignment|.
-    private static int roundUp(int x, int alignment) {
-      return (int)ceil(x / (double)alignment) * alignment;
+      return (width * height * ImageFormat.getBitsPerPixel(imageFormat)) / 8;
     }
 
     @Override
     public String toString() {
       return width + "x" + height + "@[" + minFramerate + ":" + maxFramerate + "]";
     }
 
     public boolean isSameFormat(final CaptureFormat that) {
       if (that == null) {
         return false;
@@ skipping 109 matching lines @@
         if (info.facing == facing) {
           return getDeviceName(i);
         }
       } catch (Exception e) {
         Logging.e(TAG, "getCameraInfo() failed on index " + i, e);
       }
     }
     return null;
   }
 }