Fix Java style issues in media/base/android/

BUG=320711
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@240117 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 95 insertions, 90 deletions

diff --git a/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java b/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java
index 03197b5..c61b86a 100644
--- a/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java
+++ b/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java
@@ -75,7 +75,7 @@ class AudioManagerAndroid {
     };
 
     // List of valid device types.
-    private static Integer[] VALID_DEVICES = new Integer[] {
+    private static final Integer[] VALID_DEVICES = new Integer[] {
         DEVICE_SPEAKERPHONE,
         DEVICE_WIRED_HEADSET,
         DEVICE_EARPIECE,
@@ -145,7 +145,7 @@ class AudioManagerAndroid {
     private AudioManagerAndroid(Context context, long nativeAudioManagerAndroid) {
         mContext = context;
         mNativeAudioManagerAndroid = nativeAudioManagerAndroid;
-        mAudioManager = (AudioManager)mContext.getSystemService(Context.AUDIO_SERVICE);
+        mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
         mContentResolver = mContext.getContentResolver();
     }
 
@@ -199,7 +199,7 @@ class AudioManagerAndroid {
 
         mSettingsObserverThread = new SettingsObserverThread();
         mSettingsObserverThread.start();
-        synchronized(mSettingsObserverLock) {
+        synchronized (mSettingsObserverLock) {
             try {
                 mSettingsObserverLock.wait();
             } catch (InterruptedException e) {
@@ -217,7 +217,7 @@ class AudioManagerAndroid {
         if (!mIsInitialized)
             return;
 
-        if (mSettingsObserverThread != null ) {
+        if (mSettingsObserverThread != null) {
             mSettingsObserverThread = null;
         }
         if (mSettingsObserver != null) {
@@ -296,7 +296,7 @@ class AudioManagerAndroid {
             List<String> devices = new ArrayList<String>();
             AudioDeviceName[] array = new AudioDeviceName[getNumOfAudioDevicesWithLock()];
             int i = 0;
-            for (int id = 0; id < DEVICE_COUNT; ++id ) {
+            for (int id = 0; id < DEVICE_COUNT; ++id) {
                 if (mAudioDevices[id]) {
                     array[i] = new AudioDeviceName(id, DEVICE_NAMES[id]);
                     devices.add(DEVICE_NAMES[id]);
@@ -510,9 +510,8 @@ class AudioManagerAndroid {
         } else {
             // Use BluetoothManager to get the BluetoothAdapter for
             // Android 4.3 and above.
-            BluetoothManager btManager =
-                    (BluetoothManager)mContext.getSystemService(
-                            Context.BLUETOOTH_SERVICE);
+            BluetoothManager btManager = (BluetoothManager) mContext.getSystemService(
+                    Context.BLUETOOTH_SERVICE);
             btAdapter = btManager.getAdapter();
         }
 
@@ -634,7 +633,7 @@ class AudioManagerAndroid {
             // Set this thread up so the handler will work on it.
             Looper.prepare();
 
-            synchronized(mSettingsObserverLock) {
+            synchronized (mSettingsObserverLock) {
                 mSettingsObserver = new SettingsObserver();
                 mSettingsObserverLock.notify();
             }
diff --git a/media/base/android/java/src/org/chromium/media/AudioRecordInput.java b/media/base/android/java/src/org/chromium/media/AudioRecordInput.java
index 69ef83e..b629f52 100644
--- a/media/base/android/java/src/org/chromium/media/AudioRecordInput.java
+++ b/media/base/android/java/src/org/chromium/media/AudioRecordInput.java
@@ -69,7 +69,7 @@ class AudioRecordInput {
 
             try {
                 mAudioRecord.stop();
-            } catch(IllegalStateException e) {
+            } catch (IllegalStateException e) {
                 Log.e(TAG, "stop failed", e);
             }
         }
@@ -123,8 +123,8 @@ class AudioRecordInput {
     @CalledByNative
     private boolean open() {
         if (mAudioRecord != null) {
-           Log.e(TAG, "open() called twice without a close()");
-           return false;
+            Log.e(TAG, "open() called twice without a close()");
+            return false;
         }
         int channelConfig;
         if (mChannels == 1) {
@@ -176,8 +176,8 @@ class AudioRecordInput {
     @CalledByNative
     private void start() {
         if (mAudioRecord == null) {
-           Log.e(TAG, "start() called before open().");
-           return;
+            Log.e(TAG, "start() called before open().");
+            return;
         }
         if (mAudioRecordThread != null) {
             // start() was already called.
@@ -200,8 +200,8 @@ class AudioRecordInput {
     @CalledByNative
     private void close() {
         if (mAudioRecordThread != null) {
-           Log.e(TAG, "close() called before stop().");
-           return;
+            Log.e(TAG, "close() called before stop().");
+            return;
         }
         if (mAudioRecord == null) {
             // open() was not called.
diff --git a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
index ce52b3b..b0233df 100644
--- a/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaCodecBridge.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 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.
 
@@ -194,7 +194,7 @@ class MediaCodecBridge {
     }
 
     private MediaCodecBridge(MediaCodec mediaCodec) {
-        assert(mediaCodec != null);
+        assert mediaCodec != null;
         mMediaCodec = mediaCodec;
         mLastPresentationTimeUs = 0;
         mFlushed = true;
@@ -267,9 +267,9 @@ class MediaCodecBridge {
                 status = MEDIA_CODEC_DEQUEUE_INPUT_AGAIN_LATER;
             } else {
                 Log.e(TAG, "Unexpected index_or_status: " + indexOrStatus);
-                assert(false);
+                assert false;
             }
-        } catch(Exception e) {
+        } catch (Exception e) {
             Log.e(TAG, "Failed to dequeue input buffer", e);
         }
         return new DequeueInputResult(status, index);
@@ -283,7 +283,7 @@ class MediaCodecBridge {
                 mAudioTrack.flush();
             }
             mMediaCodec.flush();
-        } catch(IllegalStateException e) {
+        } catch (IllegalStateException e) {
             Log.e(TAG, "Failed to flush MediaCodec", e);
             return MEDIA_CODEC_ERROR;
         }
@@ -320,17 +320,17 @@ class MediaCodecBridge {
 
     @CalledByNative
     private int getInputBuffersCount() {
-      return mInputBuffers.length;
+        return mInputBuffers.length;
     }
 
     @CalledByNative
     private int getOutputBuffersCount() {
-      return mOutputBuffers != null ? mOutputBuffers.length : -1;
+        return mOutputBuffers != null ? mOutputBuffers.length : -1;
     }
 
     @CalledByNative
     private int getOutputBuffersCapacity() {
-      return mOutputBuffers != null ? mOutputBuffers[0].capacity() : -1;
+        return mOutputBuffers != null ? mOutputBuffers[0].capacity() : -1;
     }
 
     @CalledByNative
@@ -350,7 +350,7 @@ class MediaCodecBridge {
         resetLastPresentationTimeIfNeeded(presentationTimeUs);
         try {
             mMediaCodec.queueInputBuffer(index, offset, size, presentationTimeUs, flags);
-        } catch(Exception e) {
+        } catch (Exception e) {
             Log.e(TAG, "Failed to queue input buffer", e);
             return MEDIA_CODEC_ERROR;
         }
@@ -389,7 +389,7 @@ class MediaCodecBridge {
             }
             Log.e(TAG, "MediaCodec.CryptoException with error code " + e.getErrorCode());
             return MEDIA_CODEC_ERROR;
-        } catch(IllegalStateException e) {
+        } catch (IllegalStateException e) {
             Log.e(TAG, "Failed to queue secure input buffer", e);
             return MEDIA_CODEC_ERROR;
         }
@@ -407,7 +407,7 @@ class MediaCodecBridge {
         int status = MEDIA_CODEC_ERROR;
         int index = -1;
         try {
-            int index_or_status = mMediaCodec.dequeueOutputBuffer(info, timeoutUs);
+            int indexOrStatus = mMediaCodec.dequeueOutputBuffer(info, timeoutUs);
             if (info.presentationTimeUs < mLastPresentationTimeUs) {
                 // TODO(qinmin): return a special code through DequeueOutputResult
                 // to notify the native code the the frame has a wrong presentation
@@ -416,18 +416,18 @@ class MediaCodecBridge {
             }
             mLastPresentationTimeUs = info.presentationTimeUs;
 
-            if (index_or_status >= 0) { // index!
+            if (indexOrStatus >= 0) { // index!
                 status = MEDIA_CODEC_OK;
-                index = index_or_status;
-            } else if (index_or_status == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
+                index = indexOrStatus;
+            } else if (indexOrStatus == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED) {
                 status = MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED;
-            } else if (index_or_status == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+            } else if (indexOrStatus == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
                 status = MEDIA_CODEC_OUTPUT_FORMAT_CHANGED;
-            } else if (index_or_status == MediaCodec.INFO_TRY_AGAIN_LATER) {
+            } else if (indexOrStatus == MediaCodec.INFO_TRY_AGAIN_LATER) {
                 status = MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER;
             } else {
-                Log.e(TAG, "Unexpected index_or_status: " + index_or_status);
-                assert(false);
+                Log.e(TAG, "Unexpected index_or_status: " + indexOrStatus);
+                assert false;
             }
         } catch (IllegalStateException e) {
             Log.e(TAG, "Failed to dequeue output buffer", e);
@@ -450,8 +450,8 @@ class MediaCodecBridge {
     }
 
     @CalledByNative
-    private static MediaFormat createAudioFormat(String mime, int SampleRate, int ChannelCount) {
-        return MediaFormat.createAudioFormat(mime, SampleRate, ChannelCount);
+    private static MediaFormat createAudioFormat(String mime, int sampleRate, int channelCount) {
+        return MediaFormat.createAudioFormat(mime, sampleRate, channelCount);
     }
 
     @CalledByNative
diff --git a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
index 16fe5028..a239004 100644
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
@@ -192,9 +192,9 @@ class MediaDrmBridge {
         if (mMediaDrm == null) {
             return false;
         }
-        assert (!mProvisioningPending);
-        assert (mMediaCryptoSession == null);
-        assert (mMediaCrypto == null);
+        assert !mProvisioningPending;
+        assert mMediaCryptoSession == null;
+        assert mMediaCrypto == null;
 
         // Open media crypto session.
         mMediaCryptoSession = openSession();
@@ -209,7 +209,7 @@ class MediaDrmBridge {
             if (MediaCrypto.isCryptoSchemeSupported(mSchemeUUID)) {
                 final byte[] mediaCryptoSession = mMediaCryptoSession.array();
                 mMediaCrypto = new MediaCrypto(mSchemeUUID, mediaCryptoSession);
-                assert (mMediaCrypto != null);
+                assert mMediaCrypto != null;
                 Log.d(TAG, "MediaCrypto successfully created!");
                 mSessionIds.put(mMediaCryptoSession, INVALID_SESSION_ID);
                 // Notify the native code that MediaCrypto is ready.
@@ -232,7 +232,7 @@ class MediaDrmBridge {
      * @return the session opened. Returns null if unexpected error happened.
      */
     private ByteBuffer openSession() throws android.media.NotProvisionedException {
-        assert (mMediaDrm != null);
+        assert mMediaDrm != null;
         try {
             byte[] session = mMediaDrm.openSession();
             // ByteBuffer.wrap() is backed by the byte[]. Make a clone here in
@@ -251,7 +251,7 @@ class MediaDrmBridge {
      * @param session to be closed.
      */
     private void closeSession(ByteBuffer session) {
-        assert (mMediaDrm != null);
+        assert mMediaDrm != null;
         mMediaDrm.closeSession(session.array());
     }
 
@@ -292,9 +292,9 @@ class MediaDrmBridge {
         Log.d(TAG, "MediaDrmBridge uses " +
                 (singleSessionMode ? "single" : "multiple") + "-session mode.");
 
-        MediaDrmBridge media_drm_bridge = null;
+        MediaDrmBridge mediaDrmBridge = null;
         try {
-            media_drm_bridge = new MediaDrmBridge(
+            mediaDrmBridge = new MediaDrmBridge(
                     cryptoScheme, securityLevel, nativeMediaDrmBridge, singleSessionMode);
         } catch (android.media.UnsupportedSchemeException e) {
             Log.e(TAG, "Unsupported DRM scheme", e);
@@ -304,7 +304,7 @@ class MediaDrmBridge {
             Log.e(TAG, "Failed to create MediaDrmBridge", e);
         }
 
-        return media_drm_bridge;
+        return mediaDrmBridge;
     }
 
     /**
@@ -370,9 +370,9 @@ class MediaDrmBridge {
      */
     private MediaDrm.KeyRequest getKeyRequest(ByteBuffer session, byte[] data, String mime)
             throws android.media.NotProvisionedException {
-        assert (mMediaDrm != null);
-        assert (mMediaCrypto != null);
-        assert (!mProvisioningPending);
+        assert mMediaDrm != null;
+        assert mMediaCrypto != null;
+        assert !mProvisioningPending;
 
         HashMap<String, String> optionalParameters = new HashMap<String, String>();
         MediaDrm.KeyRequest request = mMediaDrm.getKeyRequest(
@@ -397,7 +397,7 @@ class MediaDrmBridge {
      */
     private void processPendingCreateSessionData() {
         Log.d(TAG, "processPendingCreateSessionData()");
-        assert (mMediaDrm != null);
+        assert mMediaDrm != null;
 
         // Check mMediaDrm != null because error may happen in createSession().
         // Check !mProvisioningPending because NotProvisionedException may be
@@ -417,6 +417,7 @@ class MediaDrmBridge {
      */
     private void resumePendingOperations() {
         mHandler.post(new Runnable(){
+            @Override
             public void run() {
                 processPendingCreateSessionData();
             }
@@ -441,7 +442,7 @@ class MediaDrmBridge {
         }
 
         if (mProvisioningPending) {
-            assert (mMediaCrypto == null);
+            assert mMediaCrypto == null;
             savePendingCreateSessionData(sessionId, initData, mime);
             return;
         }
@@ -452,10 +453,10 @@ class MediaDrmBridge {
             // Create MediaCrypto if necessary.
             if (mMediaCrypto == null && !createMediaCrypto()) {
               onSessionError(sessionId);
-              return;
+                return;
             }
-            assert (mMediaCrypto != null);
-            assert (mSessionIds.containsKey(mMediaCryptoSession));
+            assert mMediaCrypto != null;
+            assert mSessionIds.containsKey(mMediaCryptoSession);
 
             if (mSingleSessionMode) {
                 session = mMediaCryptoSession;
@@ -473,7 +474,7 @@ class MediaDrmBridge {
                     return;
                 }
                 newSessionOpened = true;
-                assert (!mSessionIds.containsKey(session));
+                assert !mSessionIds.containsKey(session);
             }
 
             MediaDrm.KeyRequest request = null;
@@ -513,11 +514,11 @@ class MediaDrmBridge {
      */
     private boolean sessionExists(ByteBuffer session) {
         if (mMediaCryptoSession == null) {
-            assert (mSessionIds.isEmpty());
+            assert mSessionIds.isEmpty();
             Log.e(TAG, "Session doesn't exist because media crypto session is not created.");
             return false;
         }
-        assert (mSessionIds.containsKey(mMediaCryptoSession));
+        assert mSessionIds.containsKey(mMediaCryptoSession);
 
         if (mSingleSessionMode) {
             return mMediaCryptoSession.equals(session);
@@ -592,7 +593,7 @@ class MediaDrmBridge {
             Log.d(TAG, "Key successfully added for session " + sessionId);
             return;
         } catch (android.media.NotProvisionedException e) {
-            // TODO (xhwang): Should we handle this?
+            // TODO(xhwang): Should we handle this?
             Log.e(TAG, "failed to provide key response", e);
         } catch (android.media.DeniedByServerException e) {
             Log.e(TAG, "failed to provide key response", e);
@@ -615,8 +616,8 @@ class MediaDrmBridge {
 
     private void startProvisioning() {
         Log.d(TAG, "startProvisioning");
-        assert (mMediaDrm != null);
-        assert (!mProvisioningPending);
+        assert mMediaDrm != null;
+        assert !mProvisioningPending;
         mProvisioningPending = true;
         MediaDrm.ProvisionRequest request = mMediaDrm.getProvisionRequest();
         PostRequestTask postTask = new PostRequestTask(request.getData());
@@ -630,7 +631,7 @@ class MediaDrmBridge {
      */
     private void onProvisionResponse(byte[] response) {
         Log.d(TAG, "onProvisionResponse()");
-        assert (mProvisioningPending);
+        assert mProvisioningPending;
         mProvisioningPending = false;
 
         // If |mMediaDrm| is released, there is no need to callback native.
@@ -673,6 +674,7 @@ class MediaDrmBridge {
 
     private void onSessionCreated(final int sessionId, final String webSessionId) {
         mHandler.post(new Runnable(){
+            @Override
             public void run() {
                 nativeOnSessionCreated(mNativeMediaDrmBridge, sessionId, webSessionId);
             }
@@ -681,6 +683,7 @@ class MediaDrmBridge {
 
     private void onSessionMessage(final int sessionId, final MediaDrm.KeyRequest request) {
         mHandler.post(new Runnable(){
+            @Override
             public void run() {
                 nativeOnSessionMessage(mNativeMediaDrmBridge, sessionId,
                         request.getData(), request.getDefaultUrl());
@@ -690,6 +693,7 @@ class MediaDrmBridge {
 
     private void onSessionReady(final int sessionId) {
         mHandler.post(new Runnable() {
+            @Override
             public void run() {
                 nativeOnSessionReady(mNativeMediaDrmBridge, sessionId);
             }
@@ -698,6 +702,7 @@ class MediaDrmBridge {
 
     private void onSessionClosed(final int sessionId) {
         mHandler.post(new Runnable() {
+            @Override
             public void run() {
                 nativeOnSessionClosed(mNativeMediaDrmBridge, sessionId);
             }
@@ -707,6 +712,7 @@ class MediaDrmBridge {
     private void onSessionError(final int sessionId) {
         // TODO(qinmin): pass the error code to native.
         mHandler.post(new Runnable() {
+            @Override
             public void run() {
                 nativeOnSessionError(mNativeMediaDrmBridge, sessionId);
             }
@@ -773,10 +779,10 @@ class MediaDrmBridge {
                     break;
                 case MediaDrm.EVENT_VENDOR_DEFINED:
                     Log.d(TAG, "MediaDrm.EVENT_VENDOR_DEFINED");
-                    assert (false);  // Should never happen.
+                    assert false;  // Should never happen.
                     break;
                 default:
-                    Log.e(TAG, "Invalid DRM event " + (int)event);
+                    Log.e(TAG, "Invalid DRM event " + event);
                     return;
             }
         }
diff --git a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java
index 995f56d..555086a 100644
--- a/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java
+++ b/media/base/android/java/src/org/chromium/media/MediaPlayerListener.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 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.
 
diff --git a/media/base/android/java/src/org/chromium/media/VideoCapture.java b/media/base/android/java/src/org/chromium/media/VideoCapture.java
index d62ee20..1f7ca26 100644
--- a/media/base/android/java/src/org/chromium/media/VideoCapture.java
+++ b/media/base/android/java/src/org/chromium/media/VideoCapture.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 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.
 
@@ -106,10 +106,10 @@ public class VideoCapture implements PreviewCallback, OnFrameAvailableListener {
         }
 
         try {
-            Camera.CameraInfo camera_info = new Camera.CameraInfo();
-            Camera.getCameraInfo(mId, camera_info);
-            mCameraOrientation = camera_info.orientation;
-            mCameraFacing = camera_info.facing;
+            Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
+            Camera.getCameraInfo(mId, cameraInfo);
+            mCameraOrientation = cameraInfo.orientation;
+            mCameraFacing = cameraInfo.facing;
             mDeviceOrientation = getDeviceOrientation();
             Log.d(TAG, "allocate: device orientation=" + mDeviceOrientation +
                   ", camera orientation=" + mCameraOrientation +
@@ -125,13 +125,13 @@ public class VideoCapture implements PreviewCallback, OnFrameAvailableListener {
             }
             int frameRateInMs = frameRate * 1000;
             Iterator itFpsRange = listFpsRange.iterator();
-            int[] fpsRange = (int[])itFpsRange.next();
+            int[] fpsRange = (int[]) itFpsRange.next();
             // Use the first range as default.
             int fpsMin = fpsRange[0];
             int fpsMax = fpsRange[1];
             int newFrameRate = (fpsMin + 999) / 1000;
             while (itFpsRange.hasNext()) {
-                fpsRange = (int[])itFpsRange.next();
+                fpsRange = (int[]) itFpsRange.next();
                 if (fpsRange[0] <= frameRateInMs &&
                     frameRateInMs <= fpsRange[1]) {
                     fpsMin = fpsRange[0];
@@ -154,7 +154,7 @@ public class VideoCapture implements PreviewCallback, OnFrameAvailableListener {
             int matchedHeight = height;
             Iterator itCameraSize = listCameraSize.iterator();
             while (itCameraSize.hasNext()) {
-                Camera.Size size = (Camera.Size)itCameraSize.next();
+                Camera.Size size = (Camera.Size) itCameraSize.next();
                 int diff = Math.abs(size.width - width) +
                            Math.abs(size.height - height);
                 Log.d(TAG, "allocate: support resolution (" +
@@ -181,7 +181,7 @@ public class VideoCapture implements PreviewCallback, OnFrameAvailableListener {
 
             calculateImageFormat(matchedWidth, matchedHeight);
 
-            if (parameters.isVideoStabilizationSupported()){
+            if (parameters.isVideoStabilizationSupported()) {
                 Log.d(TAG, "Image stabilization supported, currently: "
                       + parameters.getVideoStabilization() + ", setting it.");
                 parameters.setVideoStabilization(true);
@@ -247,22 +247,22 @@ public class VideoCapture implements PreviewCallback, OnFrameAvailableListener {
 
     @CalledByNative
     public int getColorspace() {
-        switch (mImageFormat){
-        case ImageFormat.YV12:
-            return AndroidImageFormatList.ANDROID_IMAGEFORMAT_YV12;
-        case ImageFormat.NV21:
-            return AndroidImageFormatList.ANDROID_IMAGEFORMAT_NV21;
-        case ImageFormat.YUY2:
-            return AndroidImageFormatList.ANDROID_IMAGEFORMAT_YUY2;
-        case ImageFormat.NV16:
-            return AndroidImageFormatList.ANDROID_IMAGEFORMAT_NV16;
-        case ImageFormat.JPEG:
-            return AndroidImageFormatList.ANDROID_IMAGEFORMAT_JPEG;
-        case ImageFormat.RGB_565:
-            return AndroidImageFormatList.ANDROID_IMAGEFORMAT_RGB_565;
-        case ImageFormat.UNKNOWN:
-        default:
-            return AndroidImageFormatList.ANDROID_IMAGEFORMAT_UNKNOWN;
+        switch (mImageFormat) {
+            case ImageFormat.YV12:
+                return AndroidImageFormatList.ANDROID_IMAGEFORMAT_YV12;
+            case ImageFormat.NV21:
+                return AndroidImageFormatList.ANDROID_IMAGEFORMAT_NV21;
+            case ImageFormat.YUY2:
+                return AndroidImageFormatList.ANDROID_IMAGEFORMAT_YUY2;
+            case ImageFormat.NV16:
+                return AndroidImageFormatList.ANDROID_IMAGEFORMAT_NV16;
+            case ImageFormat.JPEG:
+                return AndroidImageFormatList.ANDROID_IMAGEFORMAT_JPEG;
+            case ImageFormat.RGB_565:
+                return AndroidImageFormatList.ANDROID_IMAGEFORMAT_RGB_565;
+            case ImageFormat.UNKNOWN:
+            default:
+                return AndroidImageFormatList.ANDROID_IMAGEFORMAT_UNKNOWN;
         }
     }
 
@@ -420,7 +420,7 @@ public class VideoCapture implements PreviewCallback, OnFrameAvailableListener {
     private int getDeviceOrientation() {
         int orientation = 0;
         if (mContext != null) {
-            WindowManager wm = (WindowManager)mContext.getSystemService(
+            WindowManager wm = (WindowManager) mContext.getSystemService(
                     Context.WINDOW_SERVICE);
             switch(wm.getDefaultDisplay().getRotation()) {
                 case Surface.ROTATION_90:
diff --git a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
index 170b273..5a92d09 100644
--- a/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
+++ b/media/base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.java
@@ -1,4 +1,4 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright 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.