Commit af0ddd52 authored by aurimas's avatar aurimas Committed by Commit bot

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}
parent 46f73cea
...@@ -51,7 +51,7 @@ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/content/browser/ ...@@ -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/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/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/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/CertificateMimeType.java \
$(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/CertVerifyStatusAndroid.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 \ $(call intermediates-dir-for,GYP,shared)/templates/org/chromium/net/NetError.java \
......
...@@ -94,7 +94,7 @@ generate_jni("video_capture_jni_headers") { ...@@ -94,7 +94,7 @@ generate_jni("video_capture_jni_headers") {
java_cpp_template("media_android_imageformat_list") { java_cpp_template("media_android_imageformat_list") {
package_name = "org/chromium/media" package_name = "org/chromium/media"
sources = [ sources = [
"java/src/org/chromium/media/ImageFormat.template", "java/src/org/chromium/media/AndroidImageFormat.template",
] ]
inputs = [ inputs = [
"//media/video/capture/android/imageformat_list.h" "//media/video/capture/android/imageformat_list.h"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
package org.chromium.media; package org.chromium.media;
class AndroidImageFormatList { class AndroidImageFormat {
#define DEFINE_ANDROID_IMAGEFORMAT(name, value) \ #define DEFINE_ANDROID_IMAGEFORMAT(name, value) \
static final int name = value; static final int name = value;
#include "media/video/capture/android/imageformat_list.h" #include "media/video/capture/android/imageformat_list.h"
......
...@@ -315,12 +315,12 @@ public abstract class VideoCapture implements android.hardware.Camera.PreviewCal ...@@ -315,12 +315,12 @@ public abstract class VideoCapture implements android.hardware.Camera.PreviewCal
public int getColorspace() { public int getColorspace() {
switch (mCaptureFormat.mPixelFormat) { switch (mCaptureFormat.mPixelFormat) {
case ImageFormat.YV12: case ImageFormat.YV12:
return AndroidImageFormatList.ANDROID_IMAGEFORMAT_YV12; return AndroidImageFormat.ANDROID_IMAGEFORMAT_YV12;
case ImageFormat.NV21: case ImageFormat.NV21:
return AndroidImageFormatList.ANDROID_IMAGEFORMAT_NV21; return AndroidImageFormat.ANDROID_IMAGEFORMAT_NV21;
case ImageFormat.UNKNOWN: case ImageFormat.UNKNOWN:
default: default:
return AndroidImageFormatList.ANDROID_IMAGEFORMAT_UNKNOWN; return AndroidImageFormat.ANDROID_IMAGEFORMAT_UNKNOWN;
} }
} }
......
...@@ -105,10 +105,9 @@ public class VideoCaptureAndroid extends VideoCapture { ...@@ -105,10 +105,9 @@ public class VideoCaptureAndroid extends VideoCapture {
pixelFormats.add(ImageFormat.UNKNOWN); pixelFormats.add(ImageFormat.UNKNOWN);
} }
for (Integer previewFormat : pixelFormats) { for (Integer previewFormat : pixelFormats) {
int pixelFormat = int pixelFormat = AndroidImageFormat.ANDROID_IMAGEFORMAT_UNKNOWN;
AndroidImageFormatList.ANDROID_IMAGEFORMAT_UNKNOWN;
if (previewFormat == ImageFormat.YV12) { if (previewFormat == ImageFormat.YV12) {
pixelFormat = AndroidImageFormatList.ANDROID_IMAGEFORMAT_YV12; pixelFormat = AndroidImageFormat.ANDROID_IMAGEFORMAT_YV12;
} else if (previewFormat == ImageFormat.NV21) { } else if (previewFormat == ImageFormat.NV21) {
continue; continue;
} }
......
...@@ -1822,7 +1822,7 @@ ...@@ -1822,7 +1822,7 @@
'target_name': 'media_android_imageformat_list', 'target_name': 'media_android_imageformat_list',
'type': 'none', 'type': 'none',
'sources': [ 'sources': [
'base/android/java/src/org/chromium/media/ImageFormat.template', 'base/android/java/src/org/chromium/media/AndroidImageFormat.template',
], ],
'variables': { 'variables': {
'package_name': 'org/chromium/media', 'package_name': 'org/chromium/media',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment