From 3d19009c566a35abb04511729c6255dee62bd73f Mon Sep 17 00:00:00 2001 From: Artem Titov Date: Fri, 20 Apr 2018 12:34:06 +0200 Subject: [PATCH] Temporary suppress bytebuffer warnings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently this warnings prevernt chromium roll into webrtc, because we consider them as errors. So to unblock roll all warning are suppressed. All places are documented into bug and will be fixed later. TBR=henrika@webrtc.org Bug: webrtc:9175 Change-Id: I0bf5a4b65eb49308e28f71a92d42b5fad6a99b74 Reviewed-on: https://webrtc-review.googlesource.com/71420 Commit-Queue: Artem Titov Reviewed-by: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#22956} --- .../src/org/webrtc/voiceengine/WebRtcAudioRecord.java | 2 ++ .../src/org/webrtc/EglRendererTest.java | 2 ++ .../src/org/webrtc/GlRectDrawerTest.java | 6 ++++++ sdk/android/src/java/org/webrtc/Camera1Session.java | 4 +++- .../src/java/org/webrtc/audio/WebRtcAudioRecord.java | 8 +++++--- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java index 362f14d27e..e3946a6249 100644 --- a/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java +++ b/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java @@ -143,6 +143,8 @@ public class WebRtcAudioRecord { super(name); } + // TODO(titovartem) make correct fix during webrtc:9175 + @SuppressWarnings("ByteBufferBackingArray") @Override public void run() { Process.setThreadPriority(Process.THREAD_PRIORITY_URGENT_AUDIO); diff --git a/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java b/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java index 6ba9168ee1..24b119db16 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/EglRendererTest.java @@ -224,6 +224,8 @@ public class EglRendererTest { } /** Checks that the bitmap content matches the test frame with the given index. */ + // TODO(titovartem) make correct fix during webrtc:9175 + @SuppressWarnings("ByteBufferBackingArray") private static void checkBitmapContent(Bitmap bitmap, int frame) { checkBitmap(bitmap, 1f); diff --git a/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java b/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java index e1853f2da2..424971c464 100644 --- a/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java +++ b/sdk/android/instrumentationtests/src/org/webrtc/GlRectDrawerTest.java @@ -85,6 +85,8 @@ public class GlRectDrawerTest { return rgbBuffer; } + // TODO(titovartem) make correct fix during webrtc:9175 + @SuppressWarnings("ByteBufferBackingArray") @Test @SmallTest public void testRgbRendering() { @@ -124,6 +126,8 @@ public class GlRectDrawerTest { eglBase.release(); } + // TODO(titovartem) make correct fix during webrtc:9175 + @SuppressWarnings("ByteBufferBackingArray") @Test @SmallTest public void testYuvRendering() { @@ -212,6 +216,8 @@ public class GlRectDrawerTest { * - Render the OES texture onto the pixel buffer. * - Read back the pixel buffer and compare it with the known RGB data. */ + // TODO(titovartem) make correct fix during webrtc:9175 + @SuppressWarnings("ByteBufferBackingArray") @Test @MediumTest public void testOesRendering() throws InterruptedException { diff --git a/sdk/android/src/java/org/webrtc/Camera1Session.java b/sdk/android/src/java/org/webrtc/Camera1Session.java index fff63a9332..2b649677ea 100644 --- a/sdk/android/src/java/org/webrtc/Camera1Session.java +++ b/sdk/android/src/java/org/webrtc/Camera1Session.java @@ -14,13 +14,13 @@ import android.content.Context; import android.media.MediaRecorder; import android.os.Handler; import android.os.SystemClock; -import javax.annotation.Nullable; import android.view.Surface; import android.view.WindowManager; import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; import java.util.concurrent.TimeUnit; +import javax.annotation.Nullable; import org.webrtc.CameraEnumerationAndroid.CaptureFormat; @SuppressWarnings("deprecation") @@ -52,6 +52,8 @@ class Camera1Session implements CameraSession { private SessionState state; private boolean firstFrameReported = false; + // TODO(titovartem) make correct fix during webrtc:9175 + @SuppressWarnings("ByteBufferBackingArray") public static void create(final CreateSessionCallback callback, final Events events, final boolean captureToTexture, final Context applicationContext, final SurfaceTextureHelper surfaceTextureHelper, final MediaRecorder mediaRecorder, diff --git a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java index 749b2f08ae..06be99f72b 100644 --- a/sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java +++ b/sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java @@ -11,10 +11,10 @@ package org.webrtc.audio; import android.annotation.TargetApi; -import android.media.AudioFormat; -import android.media.AudioRecord; -import android.media.AudioManager; import android.content.Context; +import android.media.AudioFormat; +import android.media.AudioManager; +import android.media.AudioRecord; import android.media.MediaRecorder.AudioSource; import android.os.Process; import java.lang.System; @@ -88,6 +88,8 @@ class WebRtcAudioRecord { super(name); } + // TODO(titovartem) make correct fix during webrtc:9175 + @SuppressWarnings("ByteBufferBackingArray") @Override public void run() { Process.setThreadPriority(Process.THREAD_PRIORITY_URGENT_AUDIO);