From 2a61b1fb52bdf29353571a7a2047ad10ff85311b Mon Sep 17 00:00:00 2001 From: huangjian Date: Thu, 1 Dec 2022 13:02:35 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"trtc=E5=8F=82=E6=95=B0=E8=B0=83?= =?UTF-8?q?=E6=95=B4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9273269367c6037b5059e4f6f83b31961a91b65b. --- .../com/mango/core/manager/trtc/TRTCEngineAdapter.java | 7 ++----- .../com/mango/core/manager/trtc/TRtcEngineManager.java | 8 ++++++-- tmpmob/ShareSDK/assets/ShareSDK.xml | 1 - 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRTCEngineAdapter.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRTCEngineAdapter.java index b13878c82..fa17079f9 100644 --- a/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRTCEngineAdapter.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRTCEngineAdapter.java @@ -728,9 +728,6 @@ public class TRTCEngineAdapter extends BaseAdapterImpl { } }); TRTCAppId = Integer.parseInt(appId); - trtcCloud.callExperimentalAPI("{\"api\":\"setAudioQualityEx\",\"params\":{ \"sampleRate\":48000, \"channel\":2,\"bitrate\":192, \"encodeMode\":1, \"systemVolumeType\":1}}"); - trtcCloud.callExperimentalAPI("{\"api\":\"enableAudioAEC\",\"params\":{ \"enable\":1,\"level\": 100}}"); - } public static TRTCEngineAdapter create(Context context, String appId, IRTCEngineHandler listener) { @@ -984,7 +981,7 @@ public class TRTCEngineAdapter extends BaseAdapterImpl { if (role == CLIENT_ROLE_BROADCASTER) { userRole = TRTCRoleAnchor; if (!TRtcEngineManager.get().isMute) { - trtcCloud.startLocalAudio(); + trtcCloud.startLocalAudio(TRTCCloudDef.TRTC_AUDIO_QUALITY_MUSIC); } } else if (role == CLIENT_ROLE_AUDIENCE) { userRole = TRTCRoleAudience; @@ -1080,7 +1077,7 @@ public class TRTCEngineAdapter extends BaseAdapterImpl { return -1; } if (enabled) { - trtcCloud.startLocalAudio(); + trtcCloud.startLocalAudio(TRTCCloudDef.TRTC_AUDIO_QUALITY_MUSIC); } else { trtcCloud.stopLocalAudio(); } diff --git a/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRtcEngineManager.java b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRtcEngineManager.java index a5c439d79..786e62c51 100644 --- a/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRtcEngineManager.java +++ b/core/src/diff_src_erban/java/com/mango/core/manager/trtc/TRtcEngineManager.java @@ -1,5 +1,8 @@ package com.mango.core.manager.trtc; +import static io.agora.rtc.Constants.AUDIO_PROFILE_MUSIC_STANDARD; +import static io.agora.rtc.Constants.AUDIO_SCENARIO_GAME_STREAMING; + import android.os.Handler; import android.text.TextUtils; import android.util.Log; @@ -7,12 +10,12 @@ import android.util.Log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.orhanobut.logger.Logger; import com.mango.core.manager.AvRoomDataManager; import com.mango.core.manager.BaseEngine; import com.mango.core.music.db.bean.LocalMusicBean; import com.mango.core.music.model.PlayerModel; import com.mango.xchat_android_library.utils.config.BasicConfig; -import com.orhanobut.logger.Logger; import io.agora.rtc.Constants; @@ -50,8 +53,9 @@ public class TRtcEngineManager extends BaseEngine { //设置频道模式为直播 mRtcEngine.disableVideo(); mRtcEngine.setChannelProfile(Constants.CHANNEL_PROFILE_LIVE_BROADCASTING); + mRtcEngine.setAudioProfile(AUDIO_PROFILE_MUSIC_STANDARD, AUDIO_SCENARIO_GAME_STREAMING); mRtcEngine.enableAudioVolumeIndication(600, 3, false); - mRtcEngine.setDefaultAudioRoutetoSpeakerphone(false); + mRtcEngine.setDefaultAudioRoutetoSpeakerphone(true); mRtcEngine.setExternalVideoSource(true, false, true); } mRtcEngine.joinChannel(AvRoomDataManager.get().trtcSig, String.valueOf(channelId), null, (int) uid); diff --git a/tmpmob/ShareSDK/assets/ShareSDK.xml b/tmpmob/ShareSDK/assets/ShareSDK.xml index 2be6ab7f1..edbac8c4d 100644 --- a/tmpmob/ShareSDK/assets/ShareSDK.xml +++ b/tmpmob/ShareSDK/assets/ShareSDK.xml @@ -55,5 +55,4 @@ - \ No newline at end of file