zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace the android support annotation library with androidx's one.

Browse Source 
This change does not affect downstream dependencies as androidx.annotation
is fully compatible with android.support.annotation.

Bug: webrtc:11962
Change-Id: I714b473df8d0fee8000ddf3a9beca7c5613db5ff
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/226881
Commit-Queue: Xavier Lepaul‎ <xalep@webrtc.org>
Reviewed-by: Xavier Lepaul‎ <xalep@webrtc.org>
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#34839}
This commit is contained in:
Byoungchan Lee
2021-08-14 11:41:59 +09:00
committed by WebRTC LUCI CQ
parent e9716de2cd
commit 02334e07c5
92 changed files with 108 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
View File

@ -14,8 +14,8 @@ import android.media.MediaCodec;
import android.media.MediaCodecInfo.CodecCapabilities;
import android.media.MediaFormat;
import android.os.SystemClock;
import android.support.annotation.Nullable;
import android.view.Surface;
import androidx.annotation.Nullable;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.concurrent.BlockingDeque;

2
sdk/android/src/java/org/webrtc/Camera2Session.java
View File

@ -21,9 +21,9 @@ import android.hardware.camera2.CameraMetadata;
import android.hardware.camera2.CaptureFailure;
import android.hardware.camera2.CaptureRequest;
import android.os.Handler;
import android.support.annotation.Nullable;
import android.util.Range;
import android.view.Surface;
import androidx.annotation.Nullable;
import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;

2
sdk/android/src/java/org/webrtc/CameraCapturer.java
View File

@ -13,7 +13,7 @@ package org.webrtc;
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.util.Arrays;
import java.util.List;

2
sdk/android/src/java/org/webrtc/EglBase10Impl.java
View File

@ -13,9 +13,9 @@ package org.webrtc;
import android.graphics.Canvas;
import android.graphics.Rect;
import android.graphics.SurfaceTexture;
import android.support.annotation.Nullable;
import android.view.Surface;
import android.view.SurfaceHolder;
import androidx.annotation.Nullable;
import javax.microedition.khronos.egl.EGL10;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.egl.EGLContext;

2
sdk/android/src/java/org/webrtc/EglBase14Impl.java
View File

@ -19,8 +19,8 @@ import android.opengl.EGLDisplay;
import android.opengl.EGLExt;
import android.opengl.EGLSurface;
import android.os.Build;
import android.support.annotation.Nullable;
import android.view.Surface;
import androidx.annotation.Nullable;
import org.webrtc.EglBase;
/**

2
sdk/android/src/java/org/webrtc/GlGenericDrawer.java
View File

@ -12,7 +12,7 @@ package org.webrtc;
import android.opengl.GLES11Ext;
import android.opengl.GLES20;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.nio.FloatBuffer;
import org.webrtc.GlShader;
import org.webrtc.GlUtil;

2
sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
View File

@ -16,8 +16,8 @@ import android.media.MediaCodecInfo;
import android.media.MediaFormat;
import android.opengl.GLES20;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.Surface;
import androidx.annotation.Nullable;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.Map;

2
sdk/android/src/java/org/webrtc/MediaCodecUtils.java
View File

@ -14,7 +14,7 @@ import android.annotation.TargetApi;
import android.media.MediaCodecInfo;
import android.media.MediaCodecInfo.CodecCapabilities;
import android.os.Build;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;

2
sdk/android/src/java/org/webrtc/MediaCodecVideoDecoderFactory.java
View File

@ -17,7 +17,7 @@ import android.media.MediaCodecInfo;
import android.media.MediaCodecInfo.CodecCapabilities;
import android.media.MediaCodecList;
import android.os.Build;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;

2
sdk/android/src/java/org/webrtc/NV12Buffer.java
View File

@ -10,7 +10,7 @@
package org.webrtc;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
public class NV12Buffer implements VideoFrame.Buffer {

2
sdk/android/src/java/org/webrtc/NV21Buffer.java
View File

@ -10,7 +10,7 @@
package org.webrtc;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
public class NV21Buffer implements VideoFrame.Buffer {

2
sdk/android/src/java/org/webrtc/NativeAndroidVideoTrackSource.java
View File

@ -10,7 +10,7 @@
package org.webrtc;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import org.webrtc.VideoFrame;
import org.webrtc.VideoProcessor;

2
sdk/android/src/java/org/webrtc/RefCountDelegate.java
View File

@ -10,7 +10,7 @@
package org.webrtc;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.util.concurrent.atomic.AtomicInteger;
/**

2
sdk/android/src/java/org/webrtc/VideoEncoderWrapper.java
View File

@ -11,7 +11,7 @@
package org.webrtc;
// Explicit imports necessary for JNI generation.
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import org.webrtc.VideoEncoder;
/**

2
sdk/android/src/java/org/webrtc/audio/VolumeLogger.java
View File

@ -11,7 +11,7 @@
package org.webrtc.audio;
import android.media.AudioManager;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.util.Timer;
import java.util.TimerTask;
import org.webrtc.Logging;

2
sdk/android/src/java/org/webrtc/audio/WebRtcAudioEffects.java
View File

@ -15,7 +15,7 @@ import android.media.audiofx.AudioEffect;
import android.media.audiofx.AudioEffect.Descriptor;
import android.media.audiofx.NoiseSuppressor;
import android.os.Build;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.util.UUID;
import org.webrtc.Logging;

4
sdk/android/src/java/org/webrtc/audio/WebRtcAudioRecord.java
View File

@ -20,8 +20,8 @@ import android.media.AudioRecordingConfiguration;
import android.media.MediaRecorder.AudioSource;
import android.os.Build;
import android.os.Process;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import java.lang.System;
import java.nio.ByteBuffer;
import java.util.Arrays;

2
sdk/android/src/java/org/webrtc/audio/WebRtcAudioTrack.java
View File

@ -18,7 +18,7 @@ import android.media.AudioManager;
import android.media.AudioTrack;
import android.os.Build;
import android.os.Process;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.nio.ByteBuffer;
import org.webrtc.CalledByNative;
import org.webrtc.Logging;