Skip to content

Commit 6756ae0

Browse files
committed
去掉androidx相关依赖
Change-Id: I543b72b928b30740432eb41e620b750aaad281d9
1 parent 50f3cc0 commit 6756ae0

File tree

3 files changed

+3
-9
lines changed

3 files changed

+3
-9
lines changed

sdk/video-link-android/build.gradle

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ android {
3737

3838
dependencies {
3939
api fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
40-
implementation 'androidx.appcompat:appcompat:1.2.0'
41-
implementation 'com.google.android.material:material:1.2.1'
4240
testImplementation 'junit:junit:4.+'
4341
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
4442
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
@@ -51,7 +49,7 @@ dependencies {
5149
// }
5250
// api 'com.tencent.iot.thirdparty.android:xp2p-sdk:2.4.23'
5351
api 'com.tencent.iot.thirdparty.android:xp2p-sdk:2.4.32'
54-
api 'com.tencent.iot.thirdparty.android:media-server:1.0.2'
52+
api 'com.tencent.iot.thirdparty.android:media-server:1.0.3'
5553
api 'io.github.sundoggynew:iot-soundtouch:1.0.0'
5654
}
5755

sdk/video-link-android/src/main/java/com/tencent/iot/video/link/encoder/AudioEncoder.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
import android.os.Build;
1010
import android.util.Log;
1111

12-
import androidx.annotation.RequiresApi;
13-
14-
1512
import com.tencent.iot.video.link.listener.OnEncodeListener;
1613
import com.tencent.iot.video.link.param.AudioEncodeParam;
1714
import com.tencent.iot.video.link.param.MicParam;

sdk/video-link-android/src/main/java/com/tencent/iot/video/link/encoder/VideoEncoder.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package com.tencent.iot.video.link.encoder;
22

3+
import android.annotation.TargetApi;
34
import android.media.MediaCodec;
45
import android.media.MediaCodecInfo;
56
import android.media.MediaFormat;
67
import android.os.Build;
78
import android.os.Bundle;
89
import android.util.Log;
910

10-
import androidx.annotation.RequiresApi;
11-
1211
import com.tencent.iot.video.link.listener.OnEncodeListener;
1312
import com.tencent.iot.video.link.param.VideoEncodeParam;
1413

@@ -66,7 +65,7 @@ private void initMediaCodec() {
6665
}
6766

6867
//描述平均位速率(以位/秒为单位)的键。 关联的值是一个整数
69-
@RequiresApi(api = Build.VERSION_CODES.KITKAT)
68+
@TargetApi(Build.VERSION_CODES.KITKAT)
7069
public void setVideoBitRate(int bitRate) {
7170
int nowBitrate = videoEncodeParam.getBitRate();
7271
int nowWidth = videoEncodeParam.getWidth();

0 commit comments

Comments
 (0)