diff options
| author | magjed <magjed@chromium.org> | 2014-09-09 11:13:26 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-09 18:17:07 +0000 |
| commit | dfdafaea26ecfb790390a0513b91f2832904b5d5 (patch) | |
| tree | f4e3612e61ecf4f3d7f61763a20d3a07ba9109a9 | |
| parent | ba90edc1df14a90c43327329a43f64910ce2fc81 (diff) | |
| download | chromium_src-dfdafaea26ecfb790390a0513b91f2832904b5d5.zip chromium_src-dfdafaea26ecfb790390a0513b91f2832904b5d5.tar.gz chromium_src-dfdafaea26ecfb790390a0513b91f2832904b5d5.tar.bz2 | |
Android video capture: suppress deprecated warnings while migrating to new API
Suppress most deprecated warnings except for imports.
BUG=398669
Review URL: https://codereview.chromium.org/555113002
Cr-Commit-Position: refs/heads/master@{#293968}
4 files changed, 4 insertions, 0 deletions
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 fe1863f..5ca9cfc 100644 --- a/media/base/android/java/src/org/chromium/media/VideoCapture.java +++ b/media/base/android/java/src/org/chromium/media/VideoCapture.java @@ -25,6 +25,7 @@ import java.util.concurrent.locks.ReentrantLock; * Video Capture Device base class to interface to native Chromium. **/ @JNINamespace("media") +@SuppressWarnings("deprecation") public abstract class VideoCapture implements PreviewCallback { protected static class CaptureFormat { diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java b/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java index d0ca092..f61dce6 100644 --- a/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java +++ b/media/base/android/java/src/org/chromium/media/VideoCaptureAndroid.java @@ -19,6 +19,7 @@ import java.util.List; * Java-allocated buffers. It also includes class BuggyDeviceHack to deal with * troublesome devices. **/ +@SuppressWarnings("deprecation") public class VideoCaptureAndroid extends VideoCapture { // Some devices don't support YV12 format correctly, even with JELLY_BEAN or diff --git a/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java b/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java index 12e10a3..d33401a 100644 --- a/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java +++ b/media/base/android/java/src/org/chromium/media/VideoCaptureFactory.java @@ -26,6 +26,7 @@ import org.chromium.media.VideoCapture; * takes into account the mentioned special devices. **/ @JNINamespace("media") +@SuppressWarnings("deprecation") class VideoCaptureFactory { static class CamParams { 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 b8f94e2..6840557 100644 --- a/media/base/android/java/src/org/chromium/media/VideoCaptureTango.java +++ b/media/base/android/java/src/org/chromium/media/VideoCaptureTango.java @@ -20,6 +20,7 @@ import java.util.Arrays; * |id| passed on constructor, according to the index correspondence in * |s_CAM_PARAMS|; all devices |id| are index 0 towards the parent VideoCapture. **/ +@SuppressWarnings("deprecation") public class VideoCaptureTango extends VideoCapture { private ByteBuffer mFrameBuffer = null; private final int mTangoCameraId; |