diff --git a/headers/rtc_4.5.0/include/AgoraBase.h b/headers/rtc_4.5.0/include/AgoraBase.h index f1208a2..88ed454 100644 --- a/headers/rtc_4.5.0/include/AgoraBase.h +++ b/headers/rtc_4.5.0/include/AgoraBase.h @@ -13,8 +13,6 @@ #include #include #include -#include -#include #include "IAgoraParameter.h" #include "AgoraMediaBase.h" @@ -4251,7 +4249,7 @@ struct MixedAudioStream { * The channel ID of the remote user. * @note Use this parameter only when the source type is `AUDIO_SOURCE_REMOTE`. */ - const char* channelName; + const char* channelId; /** * The track ID of the local track. * @note Use this parameter only when the source type is `AUDIO_SOURCE_REMOTE`. @@ -4261,7 +4259,7 @@ struct MixedAudioStream { MixedAudioStream(AUDIO_SOURCE_TYPE source) : sourceType(source), remoteUserUid(0), - channelName(NULL), + channelId(NULL), trackId(-1) {} MixedAudioStream(AUDIO_SOURCE_TYPE source, track_id_t track) @@ -4271,12 +4269,12 @@ struct MixedAudioStream { MixedAudioStream(AUDIO_SOURCE_TYPE source, uid_t uid, const char* channel) : sourceType(source), remoteUserUid(uid), - channelName(channel) {} + channelId(channel) {} MixedAudioStream(AUDIO_SOURCE_TYPE source, uid_t uid, const char* channel, track_id_t track) : sourceType(source), remoteUserUid(uid), - channelName(channel), + channelId(channel), trackId(track) {} }; @@ -4292,7 +4290,7 @@ struct LocalAudioMixerConfiguration { /** * The source of the streams to mixed; */ - MixedAudioStream* sourceStreams; + MixedAudioStream* audioInputStreams; /** * Whether to use the timestamp follow the local mic's audio frame. @@ -5193,8 +5191,14 @@ struct AudioTrackConfig { * false: Do not enable local playback */ bool enableLocalPlayback; + /** + * Whether to enable APM (AEC/ANS/AGC) processing when the trackType is AUDIO_TRACK_DIRECT. + * false: (Default) Do not enable APM processing. + * true: Enable APM processing. + */ + bool enableAudioProcessing; - AudioTrackConfig() : enableLocalPlayback(true) {} + AudioTrackConfig() : enableLocalPlayback(true),enableAudioProcessing(false) {} }; /** @@ -6809,8 +6813,8 @@ struct RecorderStreamInfo { RecorderStreamInfo() : channelId(NULL), uid(0), type(RTC) {} RecorderStreamInfo(const char* channelId, uid_t uid) : channelId(channelId), uid(uid), type(RTC) {} - RecorderStreamInfo(const char* channelId, uid_t uid, RecorderStreamType) - : channelId(channelId), uid(uid), type(RTC) {} + RecorderStreamInfo(const char* channelId, uid_t uid, RecorderStreamType type) + : channelId(channelId), uid(uid), type(type) {} }; } // namespace rtc diff --git a/headers/rtc_4.5.0/include/rte_base/rte_cpp_player.h b/headers/rtc_4.5.0/include/rte_base/rte_cpp_player.h index 62f9b39..ebef5ce 100644 --- a/headers/rtc_4.5.0/include/rte_base/rte_cpp_player.h +++ b/headers/rtc_4.5.0/include/rte_base/rte_cpp_player.h @@ -699,8 +699,8 @@ class Player { * @return bool * @technical preview */ - bool PreloadWithUrl(const char* url, Error *err = nullptr) { - return RtePlayerPreloadWithUrl(&c_player, url, err != nullptr ? err->get_underlying_impl() : nullptr); + static bool PreloadWithUrl(const char* url, Error *err = nullptr) { + return RtePlayerPreloadWithUrl(nullptr, url, err != nullptr ? err->get_underlying_impl() : nullptr); }; /**