Skip to content

GitLab

T
tangled
Commit dc59e542 authored by mcasas's avatar mcasas Committed by Commit bot
Browse files
Options

Android Video Capture: Using full class path for Camera+subclasses to avoid @deprecation warnings 

Since @SuppressWarnings("deprecated") doesn't work for
import statements, the only option is to use the fully
qualified class path in every reference.

To be sure, two deprecation warnings still remain,
namely in the use of

public abstract class VideoCapture implements android.hardware.Camera.PreviewCallback {

That somehow is not covered by the suppression.

TBR=qinmin@chromium.org
BUG=398669

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

Cr-Commit-Position: refs/heads/master@{#296918}
parent d5597f9c
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 48 deletions
media/base/android/java/src/org/chromium/media/VideoCapture.java
View file @ dc59e542
......@@ -7,8 +7,6 @@ package org.chromium.media;
import android.content.Context;
import android.graphics.ImageFormat;
import android.graphics.SurfaceTexture;
import android.hardware.Camera;
import android.hardware.Camera.PreviewCallback;
import android.opengl.GLES20;
import android.util.Log;
import android.view.Surface;
......@@ -26,7 +24,7 @@ import java.util.concurrent.locks.ReentrantLock;
**/
@JNINamespace("media")
@SuppressWarnings("deprecation")
public abstract class VideoCapture implements PreviewCallback {
public abstract class VideoCapture implements android.hardware.Camera.PreviewCallback {
protected static class CaptureFormat {
int mWidth;
......@@ -59,7 +57,7 @@ public abstract class VideoCapture implements PreviewCallback {
}
}
protected Camera mCamera;
protected android.hardware.Camera mCamera;
protected CaptureFormat mCaptureFormat = null;
// Lock to mutually exclude execution of OnPreviewFrame {start/stop}Capture.
protected ReentrantLock mPreviewBufferLock = new ReentrantLock();
......@@ -92,13 +90,13 @@ public abstract class VideoCapture implements PreviewCallback {
Log.d(TAG, "allocate: requested (" + width + "x" + height + ")@" +
frameRate + "fps");
try {
mCamera = Camera.open(mId);
mCamera = android.hardware.Camera.open(mId);
} catch (RuntimeException ex) {
Log.e(TAG, "allocate: Camera.open: " + ex);
return false;
}
Camera.CameraInfo cameraInfo = getCameraInfo(mId);
android.hardware.Camera.CameraInfo cameraInfo = getCameraInfo(mId);
if (cameraInfo == null) {
mCamera.release();
mCamera = null;
......@@ -111,7 +109,7 @@ public abstract class VideoCapture implements PreviewCallback {
Log.d(TAG, "allocate: orientation dev=" + mDeviceOrientation +
", cam=" + mCameraOrientation + ", facing=" + mCameraFacing);
Camera.Parameters parameters = getCameraParameters(mCamera);
android.hardware.Camera.Parameters parameters = getCameraParameters(mCamera);
if (parameters == null) {
mCamera = null;
return false;
......@@ -139,12 +137,12 @@ public abstract class VideoCapture implements PreviewCallback {
Log.d(TAG, "allocate: fps set to " + frameRate);
// Calculate size.
List<Camera.Size> listCameraSize =
List<android.hardware.Camera.Size> listCameraSize =
parameters.getSupportedPreviewSizes();
int minDiff = Integer.MAX_VALUE;
int matchedWidth = width;
int matchedHeight = height;
for (Camera.Size size : listCameraSize) {
for (android.hardware.Camera.Size size : listCameraSize) {
int diff = Math.abs(size.width - width) +
Math.abs(size.height - height);
Log.d(TAG, "allocate: supported (" +
......@@ -288,7 +286,7 @@ public abstract class VideoCapture implements PreviewCallback {
int width,
int height,
int frameRate,
Camera.Parameters cameraParameters);
android.hardware.Camera.Parameters cameraParameters);
// Local hook to allow derived classes to configure and plug capture
// buffers if needed.
......@@ -296,7 +294,7 @@ public abstract class VideoCapture implements PreviewCallback {
// Local method to be overriden with the particular setPreviewCallback to be
// used in the implementations.
abstract void setPreviewCallback(Camera.PreviewCallback cb);
abstract void setPreviewCallback(android.hardware.Camera.PreviewCallback cb);
@CalledByNative
public int queryWidth() {
......@@ -357,24 +355,25 @@ public abstract class VideoCapture implements PreviewCallback {
int length,
int rotation);
protected static Camera.Parameters getCameraParameters(Camera camera) {
Camera.Parameters parameters;
protected static android.hardware.Camera.Parameters getCameraParameters(
android.hardware.Camera camera) {
android.hardware.Camera.Parameters parameters;
try {
parameters = camera.getParameters();
} catch (RuntimeException ex) {
Log.e(TAG, "getCameraParameters: Camera.getParameters: " + ex);
Log.e(TAG, "getCameraParameters: android.hardware.Camera.getParameters: " + ex);
camera.release();
return null;
}
return parameters;
}
private Camera.CameraInfo getCameraInfo(int id) {
Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
private android.hardware.Camera.CameraInfo getCameraInfo(int id) {
android.hardware.Camera.CameraInfo cameraInfo = new android.hardware.Camera.CameraInfo();
try {
Camera.getCameraInfo(id, cameraInfo);
android.hardware.Camera.getCameraInfo(id, cameraInfo);
} catch (RuntimeException ex) {
Log.e(TAG, "getCameraInfo: Camera.getCameraInfo: " + ex);
Log.e(TAG, "getCameraInfo: android.hardware.Camera.getCameraInfo: " + ex);
return null;
}
return cameraInfo;
......
media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java
View file @ dc59e542
......@@ -6,8 +6,6 @@ package org.chromium.media;
import android.content.Context;
import android.graphics.ImageFormat;
import android.hardware.Camera;
import android.hardware.Camera.Size;
import android.util.Log;
import java.util.ArrayList;
......@@ -82,14 +80,14 @@ public class VideoCaptureAndroid extends VideoCapture {
private static final String TAG = "VideoCaptureAndroid";
static CaptureFormat[] getDeviceSupportedFormats(int id) {
Camera camera;
android.hardware.Camera camera;
try {
camera = Camera.open(id);
camera = android.hardware.Camera.open(id);
} catch (RuntimeException ex) {
Log.e(TAG, "Camera.open: " + ex);
return null;
}
Camera.Parameters parameters = getCameraParameters(camera);
android.hardware.Camera.Parameters parameters = getCameraParameters(camera);
if (parameters == null) {
return null;
}
......@@ -123,15 +121,15 @@ public class VideoCaptureAndroid extends VideoCapture {
listFpsRange.add(new int[] {0, 0});
}
for (int[] fpsRange : listFpsRange) {
List<Camera.Size> supportedSizes =
List<android.hardware.Camera.Size> supportedSizes =
parameters.getSupportedPreviewSizes();
if (supportedSizes == null) {
supportedSizes = new ArrayList<Camera.Size>();
supportedSizes = new ArrayList<android.hardware.Camera.Size>();
}
if (supportedSizes.size() == 0) {
supportedSizes.add(camera.new Size(0, 0));
}
for (Camera.Size size : supportedSizes) {
for (android.hardware.Camera.Size size : supportedSizes) {
formatList.add(new CaptureFormat(size.width,
size.height,
(fpsRange[1] + 999) / 1000,
......@@ -154,7 +152,7 @@ public class VideoCaptureAndroid extends VideoCapture {
int width,
int height,
int frameRate,
Camera.Parameters cameraParameters) {
android.hardware.Camera.Parameters cameraParameters) {
mCaptureFormat = new CaptureFormat(
width, height, frameRate, BuggyDeviceHack.getImageFormat());
// Hack to avoid certain capture resolutions under a minimum one,
......@@ -173,12 +171,12 @@ public class VideoCaptureAndroid extends VideoCapture {
}
@Override
protected void setPreviewCallback(Camera.PreviewCallback cb) {
protected void setPreviewCallback(android.hardware.Camera.PreviewCallback cb) {
mCamera.setPreviewCallbackWithBuffer(cb);
}
@Override
public void onPreviewFrame(byte[] data, Camera camera) {
public void onPreviewFrame(byte[] data, android.hardware.Camera camera) {
mPreviewBufferLock.lock();
try {
if (!mIsRunning) {
......@@ -189,7 +187,7 @@ public class VideoCaptureAndroid extends VideoCapture {
if (rotation != mDeviceOrientation) {
mDeviceOrientation = rotation;
}
if (mCameraFacing == Camera.CameraInfo.CAMERA_FACING_BACK) {
if (mCameraFacing == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK) {
rotation = 360 - rotation;
}
rotation = (mCameraOrientation + rotation) % 360;
......
media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java
View file @ dc59e542
......@@ -6,7 +6,6 @@ package org.chromium.media;
import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.Camera;
import android.util.Log;
import org.chromium.base.CalledByNative;
......@@ -45,7 +44,7 @@ class VideoCaptureFactory {
static class ChromiumCameraInfo {
private final int mId;
private final Camera.CameraInfo mCameraInfo;
private final android.hardware.Camera.CameraInfo mCameraInfo;
// Special devices have more cameras than usual. Those devices are
// identified by model & device. Currently only the Tango is supported.
// Note that these devices have no Camera.CameraInfo.
......@@ -91,7 +90,7 @@ class VideoCaptureFactory {
if (PackageManager.PERMISSION_GRANTED ==
appContext.getPackageManager().checkPermission(
"android.permission.CAMERA", appContext.getPackageName())) {
sNumberOfSystemCameras = Camera.getNumberOfCameras();
sNumberOfSystemCameras = android.hardware.Camera.getNumberOfCameras();
} else {
sNumberOfSystemCameras = 0;
Log.w(TAG, "Missing android.permission.CAMERA permission, "
......@@ -126,10 +125,10 @@ class VideoCaptureFactory {
return "";
}
Log.d(TAG, "Camera enumerated: " + (mCameraInfo.facing ==
Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" :
android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" :
"back"));
return "camera " + mId + ", facing " + (mCameraInfo.facing ==
Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" :
android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT ? "front" :
"back");
}
}
......@@ -137,18 +136,19 @@ class VideoCaptureFactory {
@CalledByNative("ChromiumCameraInfo")
private int getOrientation() {
if (isSpecialCamera(mId)) {
return Camera.CameraInfo.CAMERA_FACING_BACK;
return android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK;
} else {
return (mCameraInfo == null ? 0 : mCameraInfo.orientation);
}
}
private Camera.CameraInfo getCameraInfo(int id) {
Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
private android.hardware.Camera.CameraInfo getCameraInfo(int id) {
android.hardware.Camera.CameraInfo cameraInfo =
new android.hardware.Camera.CameraInfo();
try {
Camera.getCameraInfo(id, cameraInfo);
android.hardware.Camera.getCameraInfo(id, cameraInfo);
} catch (RuntimeException ex) {
Log.e(TAG, "getCameraInfo: Camera.getCameraInfo: " + ex);
Log.e(TAG, "getCameraInfo: android.hardware.Camera.getCameraInfo: " + ex);
return null;
}
return cameraInfo;
......
media/base/android/java/src/org/chromium/media/VideoCaptureTango.java
View file @ dc59e542
......@@ -6,7 +6,6 @@ package org.chromium.media;
import android.content.Context;
import android.graphics.ImageFormat;
import android.hardware.Camera;
import android.util.Log;
import java.nio.ByteBuffer;
......@@ -78,11 +77,11 @@ public class VideoCaptureTango extends VideoCapture {
@Override
protected void setCaptureParameters(int width, int height, int frameRate,
Camera.Parameters cameraParameters) {
android.hardware.Camera.Parameters cameraParameters) {
mCaptureFormat = new CaptureFormat(CAM_PARAMS[mTangoCameraId].mWidth,
CAM_PARAMS[mTangoCameraId].mHeight,
frameRate,
ImageFormat.YV12);
CAM_PARAMS[mTangoCameraId].mHeight,
frameRate,
ImageFormat.YV12);
// Connect Tango SuperFrame mode. Available sf modes are "all",
// "big-rgb", "small-rgb", "depth", "ir".
cameraParameters.set("sf-mode", "all");
......@@ -98,12 +97,12 @@ public class VideoCaptureTango extends VideoCapture {
}
@Override
protected void setPreviewCallback(Camera.PreviewCallback cb) {
protected void setPreviewCallback(android.hardware.Camera.PreviewCallback cb) {
mCamera.setPreviewCallback(cb);
}
@Override
public void onPreviewFrame(byte[] data, Camera camera) {
public void onPreviewFrame(byte[] data, android.hardware.Camera camera) {
mPreviewBufferLock.lock();
try {
if (!mIsRunning) return;
......@@ -113,7 +112,7 @@ public class VideoCaptureTango extends VideoCapture {
if (rotation != mDeviceOrientation) {
mDeviceOrientation = rotation;
}
if (mCameraFacing == Camera.CameraInfo.CAMERA_FACING_BACK) {
if (mCameraFacing == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK) {
rotation = 360 - rotation;
}
rotation = (mCameraOrientation + rotation) % 360;
......
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