summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authoraurimas <aurimas@chromium.org>2014-09-25 10:35:37 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-25 17:36:03 +0000
commitd350ea5cedf5d3b139f7d88c3c66b3f5e36952c7 (patch)
treee65141e048dfb32b80a0797ef27bfe3bba2b18b2 /media
parentf89c3a34a93ae0bccf69046febe03c61b14f932f (diff)
downloadchromium_src-d350ea5cedf5d3b139f7d88c3c66b3f5e36952c7.zip
chromium_src-d350ea5cedf5d3b139f7d88c3c66b3f5e36952c7.tar.gz
chromium_src-d350ea5cedf5d3b139f7d88c3c66b3f5e36952c7.tar.bz2
[Checkstyle] Fix misc style issues in Java files.
BUG=318404 TBR=zea@chromium.org,mkosiba@chromium.org Review URL: https://codereview.chromium.org/600983002 Cr-Commit-Position: refs/heads/master@{#296734}
Diffstat (limited to 'media')
-rw-r--r--media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java2
-rw-r--r--media/base/android/java/src/org/chromium/media/MediaDrmBridge.java6
-rw-r--r--media/base/android/java/src/org/chromium/media/UsbMidiDeviceFactoryAndroid.java7
-rw-r--r--media/base/android/java/src/org/chromium/media/VideoCaptureTango.java58
4 files changed, 29 insertions, 44 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 1e52484..76e1867 100644
--- a/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java
+++ b/media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java
@@ -655,7 +655,7 @@ class AudioManagerAndroid {
// Use BluetoothManager to get the BluetoothAdapter for
// Android 4.3 and above.
BluetoothManager btManager =
- (BluetoothManager)mContext.getSystemService(
+ (BluetoothManager) mContext.getSystemService(
Context.BLUETOOTH_SERVICE);
btAdapter = btManager.getAdapter();
} else {
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 7db355b..bec901b 100644
--- a/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
+++ b/media/base/android/java/src/org/chromium/media/MediaDrmBridge.java
@@ -775,12 +775,12 @@ public class MediaDrmBridge {
private class MediaDrmListener implements MediaDrm.OnEventListener {
@Override
public void onEvent(
- MediaDrm mediaDrm, byte[] session_array, int event, int extra, byte[] data) {
- if (session_array == null) {
+ MediaDrm mediaDrm, byte[] sessionArray, int event, int extra, byte[] data) {
+ if (sessionArray == null) {
Log.e(TAG, "MediaDrmListener: Null session.");
return;
}
- ByteBuffer session = ByteBuffer.wrap(session_array);
+ ByteBuffer session = ByteBuffer.wrap(sessionArray);
if (!sessionExists(session)) {
Log.e(TAG, "MediaDrmListener: Invalid session.");
return;
diff --git a/media/base/android/java/src/org/chromium/media/UsbMidiDeviceFactoryAndroid.java b/media/base/android/java/src/org/chromium/media/UsbMidiDeviceFactoryAndroid.java
index 7c0953f..ffcc9ea 100644
--- a/media/base/android/java/src/org/chromium/media/UsbMidiDeviceFactoryAndroid.java
+++ b/media/base/android/java/src/org/chromium/media/UsbMidiDeviceFactoryAndroid.java
@@ -59,7 +59,7 @@ class UsbMidiDeviceFactoryAndroid {
/**
* Constructs a UsbMidiDeviceAndroid.
- * @param natviePointer The native pointer to which the created factory is associated.
+ * @param nativePointer The native pointer to which the created factory is associated.
*/
UsbMidiDeviceFactoryAndroid(long nativePointer) {
mNativePointer = nativePointer;
@@ -85,7 +85,7 @@ class UsbMidiDeviceFactoryAndroid {
*/
@CalledByNative
boolean enumerateDevices(Context context) {
- mUsbManager = (UsbManager)context.getSystemService(Context.USB_SERVICE);
+ mUsbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
Map<String, UsbDevice> devices = mUsbManager.getDeviceList();
PendingIntent pendingIntent = PendingIntent.getBroadcast(
context, 0, new Intent(ACTION_USB_PERMISSION), 0);
@@ -111,6 +111,7 @@ class UsbMidiDeviceFactoryAndroid {
IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION);
mReceiver = new BroadcastReceiver() {
+ @Override
public void onReceive(Context context, Intent intent) {
if (ACTION_USB_PERMISSION.equals(intent.getAction())) {
onRequestDone(context, intent);
@@ -128,7 +129,7 @@ class UsbMidiDeviceFactoryAndroid {
* nativeOnUsbMidiDeviceRequestDone with the accessible USB-MIDI devices.
*/
private void onRequestDone(Context context, Intent intent) {
- UsbDevice device = (UsbDevice)intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+ UsbDevice device = (UsbDevice) intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
if (!mRequestedDevices.contains(device)) {
// We are not interested in the device.
return;
diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureTango.java b/media/base/android/java/src/org/chromium/media/VideoCaptureTango.java
index 6840557..d616584 100644
--- a/media/base/android/java/src/org/chromium/media/VideoCaptureTango.java
+++ b/media/base/android/java/src/org/chromium/media/VideoCaptureTango.java
@@ -70,27 +70,21 @@ public class VideoCaptureTango extends VideoCapture {
return formatList.toArray(new CaptureFormat[formatList.size()]);
}
- VideoCaptureTango(Context context,
- int id,
- long nativeVideoCaptureDeviceAndroid) {
- // All Tango cameras are like the back facing one for the generic
- // VideoCapture code.
+ VideoCaptureTango(Context context, int id, long nativeVideoCaptureDeviceAndroid) {
+ // All Tango cameras are like the back facing one for the generic VideoCapture code.
super(context, 0, nativeVideoCaptureDeviceAndroid);
mTangoCameraId = id;
}
@Override
- protected void setCaptureParameters(
- int width,
- int height,
- int frameRate,
+ protected void setCaptureParameters(int width, int height, int frameRate,
Camera.Parameters cameraParameters) {
- mCaptureFormat = new CaptureFormat(CAM_PARAMS[mTangoCameraId].mWidth,
+ mCaptureFormat = new CaptureFormat(CAM_PARAMS[mTangoCameraId].mWidth,
CAM_PARAMS[mTangoCameraId].mHeight,
frameRate,
ImageFormat.YV12);
- // Connect Tango SuperFrame mode. Available sf modes are "all",
- // "big-rgb", "small-rgb", "depth", "ir".
+ // Connect Tango SuperFrame mode. Available sf modes are "all",
+ // "big-rgb", "small-rgb", "depth", "ir".
cameraParameters.set("sf-mode", "all");
}
@@ -112,9 +106,8 @@ public class VideoCaptureTango extends VideoCapture {
public void onPreviewFrame(byte[] data, Camera camera) {
mPreviewBufferLock.lock();
try {
- if (!mIsRunning) {
- return;
- }
+ if (!mIsRunning) return;
+
if (data.length == SF_WIDTH * SF_FULL_HEIGHT) {
int rotation = getDeviceOrientation();
if (rotation != mDeviceOrientation) {
@@ -128,8 +121,7 @@ public class VideoCaptureTango extends VideoCapture {
if (mTangoCameraId == DEPTH_CAMERA_ID) {
int sizeY = SF_WIDTH * SF_LINES_DEPTH;
int startY =
- SF_WIDTH * (SF_LINES_HEADER + SF_LINES_FISHEYE +
- SF_LINES_RESERVED);
+ SF_WIDTH * (SF_LINES_HEADER + SF_LINES_FISHEYE + SF_LINES_RESERVED);
// Depth is composed of 16b samples in which only 12b are
// used. Throw away lowest 4 resolution bits. Android
// platforms are big endian, LSB in lowest address. In this
@@ -137,26 +129,21 @@ public class VideoCaptureTango extends VideoCapture {
// explicitly since they're filled to 128 on creation.
byte depthsample;
for (int j = startY; j < startY + 2 * sizeY; j += 2) {
- depthsample = (byte)((data[j + 1] << 4) |
- ((data[j] & 0xF0) >> 4));
+ depthsample = (byte) ((data[j + 1] << 4) | ((data[j] & 0xF0) >> 4));
mFrameBuffer.put(depthsample);
}
- for (int j = 0;
- j < mCaptureFormat.mWidth * mCaptureFormat.mHeight -
- sizeY;
- ++j)
- mFrameBuffer.put((byte)0);
+ for (int j = 0; j < mCaptureFormat.mWidth * mCaptureFormat.mHeight - sizeY;
+ ++j) {
+ mFrameBuffer.put((byte) 0);
+ }
} else if (mTangoCameraId == FISHEYE_CAMERA_ID) {
int sizeY = SF_WIDTH * SF_LINES_FISHEYE;
int startY = SF_WIDTH * SF_LINES_HEADER;
- // Fisheye is black and white so Chroma components are
- // unused. No need to write them explicitly since they're
- // filled to 128 on creation.
- ByteBuffer.wrap(data, startY, sizeY)
- .get(mFrameBuffer.array(), 0, sizeY);
+ // Fisheye is black and white so Chroma components are unused. No need to write
+ // them explicitly since they're filled to 128 on creation.
+ ByteBuffer.wrap(data, startY, sizeY).get(mFrameBuffer.array(), 0, sizeY);
} else if (mTangoCameraId == FOURMP_CAMERA_ID) {
- int startY =
- SF_WIDTH * (SF_LINES_HEADER + SF_LINES_FISHEYE +
+ int startY = SF_WIDTH * (SF_LINES_HEADER + SF_LINES_FISHEYE +
SF_LINES_RESERVED + SF_LINES_DEPTH_PADDED);
int sizeY = SF_WIDTH * SF_LINES_BIGIMAGE;
@@ -164,8 +151,7 @@ public class VideoCaptureTango extends VideoCapture {
// and format of these channels.
int startU = SF_WIDTH * (SF_HEIGHT + SF_OFFSET_4MP_CHROMA);
int sizeU = SF_WIDTH * SF_LINES_BIGIMAGE / 4;
- int startV = (SF_WIDTH * SF_HEIGHT * 5 / 4) +
- SF_WIDTH * SF_OFFSET_4MP_CHROMA;
+ int startV = (SF_WIDTH * SF_HEIGHT * 5 / 4) + SF_WIDTH * SF_OFFSET_4MP_CHROMA;
int sizeV = SF_WIDTH * SF_LINES_BIGIMAGE / 4;
// Equivalent to the following |for| loop but much faster:
@@ -182,10 +168,8 @@ public class VideoCaptureTango extends VideoCapture {
return;
}
mFrameBuffer.rewind(); // Important!
- nativeOnFrameAvailable(mNativeVideoCaptureDeviceAndroid,
- mFrameBuffer.array(),
- mFrameBuffer.capacity(),
- rotation);
+ nativeOnFrameAvailable(mNativeVideoCaptureDeviceAndroid, mFrameBuffer.array(),
+ mFrameBuffer.capacity(), rotation);
}
} finally {
mPreviewBufferLock.unlock();