Rename AndroidImage format template to match the Java class.

In Java the filename and classname must match.

BUG=None
TBR=dalecurtis@chromium.org

Review URL: https://codereview.chromium.org/606343003

Cr-Commit-Position: refs/heads/master@{#297317}

android_webview/java_library_common.mk

@@ -51,7 +51,7 @@ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/input/SelectionEventType.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/common/ResultCodes.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content_public/common/ScreenOrientationValues.java \
-$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/ImageFormat.java \
+$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/media/AndroidImageFormat.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertificateMimeType.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyStatusAndroid.java \
 $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/NetError.java \

media/base/android/BUILD.gn

@@ -94,7 +94,7 @@ generate_jni("video_capture_jni_headers") {
 java_cpp_template("media_android_imageformat_list") {
   package_name = "org/chromium/media"
   sources = [
-    "java/src/org/chromium/media/ImageFormat.template",
+    "java/src/org/chromium/media/AndroidImageFormat.template",
   ]
   inputs = [
     "//media/video/capture/android/imageformat_list.h"

media/base/android/java/src/org/chromium/media/AndroidImageFormat.template

@@ -4,7 +4,7 @@
 
 package org.chromium.media;
 
-class AndroidImageFormatList {
+class AndroidImageFormat {
 #define DEFINE_ANDROID_IMAGEFORMAT(name, value) \
     static final int name = value;
 #include "media/video/capture/android/imageformat_list.h"

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

@@ -315,12 +315,12 @@ public abstract class VideoCapture implements android.hardware.Camera.PreviewCal
     public int getColorspace() {
         switch (mCaptureFormat.mPixelFormat) {
             case ImageFormat.YV12:
-                return AndroidImageFormatList.ANDROID_IMAGEFORMAT_YV12;
+                return AndroidImageFormat.ANDROID_IMAGEFORMAT_YV12;
             case ImageFormat.NV21:
-                return AndroidImageFormatList.ANDROID_IMAGEFORMAT_NV21;
+                return AndroidImageFormat.ANDROID_IMAGEFORMAT_NV21;
             case ImageFormat.UNKNOWN:
             default:
-                return AndroidImageFormatList.ANDROID_IMAGEFORMAT_UNKNOWN;
+                return AndroidImageFormat.ANDROID_IMAGEFORMAT_UNKNOWN;
         }
     }
 

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

@@ -105,10 +105,9 @@ public class VideoCaptureAndroid extends VideoCapture {
             pixelFormats.add(ImageFormat.UNKNOWN);
         }
         for (Integer previewFormat : pixelFormats) {
-            int pixelFormat =
+            int pixelFormat = AndroidImageFormat.ANDROID_IMAGEFORMAT_UNKNOWN;
-                    AndroidImageFormatList.ANDROID_IMAGEFORMAT_UNKNOWN;
             if (previewFormat == ImageFormat.YV12) {
-                pixelFormat = AndroidImageFormatList.ANDROID_IMAGEFORMAT_YV12;
+                pixelFormat = AndroidImageFormat.ANDROID_IMAGEFORMAT_YV12;
             } else if (previewFormat == ImageFormat.NV21) {
                 continue;
             }

media/media.gyp

@@ -1822,7 +1822,7 @@
           'target_name': 'media_android_imageformat_list',
           'type': 'none',
           'sources': [
-            'base/android/java/src/org/chromium/media/ImageFormat.template',
+            'base/android/java/src/org/chromium/media/AndroidImageFormat.template',
           ],
           'variables': {
             'package_name': 'org/chromium/media',