diff --git a/docs/TODO.md b/docs/TODO.md index 891e120..260e234 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -1,9 +1,26 @@ # 计划任务 +如果优化代码影响已经优化过的代码需要对旧代码重新优化 + +## 代码结构 + +日志 +枚举 +常量 +变量 +静态代码 +单例变量 +单例静态函数 +构造函数 +静态成员函数 +成员函数(public/protected/private) +getter/setter + ## 日常任务 * 过时方法 * 缩进调整:`tab->space` +* 方法调整:`getter/setter` * 注释优化:详细描述、单位描述 * 日志优化: * 添加测试: @@ -15,6 +32,7 @@ * 录制底噪 * 分辨率调整 +* 降低视频录制大小 * 查询消费者生产者信息 ## 完成任务 diff --git a/taoyao-client-android/README.md b/taoyao-client-android/README.md index 559efd8..75a3c67 100644 --- a/taoyao-client-android/README.md +++ b/taoyao-client-android/README.md @@ -1,7 +1,5 @@ # 安卓终端 -注意:功能还没完成 - ## C++终端 * [libmediasoupclient源码](https://github.com/versatica/libmediasoupclient) @@ -10,11 +8,11 @@ ## 项目配置 -可以自己编译`WebRTC`依赖或者下载已有依赖,项目导入以后拷贝`libmediasoupclient`源码还有`WebRTC`头文件和二进制文件到`deps`目录。 +可以自己编译`WebRTC`依赖或者下载已有依赖,项目导入以后拷贝`libmediasoupclient`源码还有`WebRTC`头文件和库文件到`deps`目录。 [WebRTC](https://pan.baidu.com/s/1E_DXv32D9ODyj5J-o-ji_g?pwd=hudc) -> 注意删除目录`linux-include/build`和`linux-include/third_party`目录中除了`abseil-cpp`以外的所有依赖(当然不删也没关系就是文件太多编译器会变慢) +> 注意删除目录`build`目录和`third_party`目录中除了`abseil-cpp`以外的所有依赖(当然不删也没关系就是文件太多编译器会变慢) ## 视频旋转 diff --git a/taoyao-client-android/taoyao/boot/build.gradle b/taoyao-client-android/taoyao/boot/build.gradle index 52910f1..a04ef28 100644 --- a/taoyao-client-android/taoyao/boot/build.gradle +++ b/taoyao-client-android/taoyao/boot/build.gradle @@ -14,7 +14,7 @@ android { } buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/taoyao-client-android/taoyao/client/.gitignore b/taoyao-client-android/taoyao/client/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/taoyao-client-android/taoyao/client/build.gradle b/taoyao-client-android/taoyao/client/build.gradle index 97dc894..7583a69 100644 --- a/taoyao-client-android/taoyao/client/build.gradle +++ b/taoyao-client-android/taoyao/client/build.gradle @@ -10,12 +10,13 @@ android { targetSdk 32 versionCode 100 versionName "1.0.0" + consumerProguardFiles "consumer-rules.pro" applicationId "com.acgist.taoyao.client" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/taoyao-client-android/taoyao/boot/.gitignore b/taoyao-client-android/taoyao/client/consumer-rules.pro similarity index 100% rename from taoyao-client-android/taoyao/boot/.gitignore rename to taoyao-client-android/taoyao/client/consumer-rules.pro diff --git a/taoyao-client-android/taoyao/media/.gitignore b/taoyao-client-android/taoyao/media/.gitignore deleted file mode 100644 index e69de29..0000000 diff --git a/taoyao-client-android/taoyao/media/build.gradle b/taoyao-client-android/taoyao/media/build.gradle index 601a013..623360f 100644 --- a/taoyao-client-android/taoyao/media/build.gradle +++ b/taoyao-client-android/taoyao/media/build.gradle @@ -8,7 +8,7 @@ def WEBRTC_LIB_PATH = "${projectDir}/deps/webrtc/lib" android { namespace 'com.acgist.mediasoup' compileSdk 32 - // ndkVersion "23.1.7779620" + ndkVersion "23.1.7779620" defaultConfig { minSdk 30 targetSdk 32 @@ -32,7 +32,7 @@ android { } buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } @@ -55,7 +55,6 @@ android { dependencies { api project(path: ':boot') -// api fileTree(dir: 'libs', include: ['*.jar']) implementation 'androidx.annotation:annotation:1.3.0' testImplementation 'junit:junit:4.13.2' } diff --git a/taoyao-client-android/taoyao/media/src/main/java/org/webrtc/audio/WebRtcAudioRecord.java b/taoyao-client-android/taoyao/media/src/main/java/org/webrtc/audio/WebRtcAudioRecord.java index 89acb28..36aefcb 100644 --- a/taoyao-client-android/taoyao/media/src/main/java/org/webrtc/audio/WebRtcAudioRecord.java +++ b/taoyao-client-android/taoyao/media/src/main/java/org/webrtc/audio/WebRtcAudioRecord.java @@ -117,11 +117,12 @@ class WebRtcAudioRecord { * @Taoyao */ public void setMixerProcesser(SamplesReadyCallback samplesReadyCallback) { - // 不用处理这个逻辑:设置为空表示关闭录制 + // 不用处理这个逻辑设置为空表示关闭录制 // if(this.audioSamplesReadyCallback != null && samplesReadyCallback == null) { // this.audioSamplesReadyCallback.startNative(); // } this.audioSamplesReadyCallback = samplesReadyCallback; + // 下面逻辑最好加锁防止关闭录制导致异常 if(this.audioSamplesReadyCallback != null) { if(this.audioThread == null) { this.audioSamplesReadyCallback.startNative();