Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AUTO] Update native headers to rtc_4.5.0 #156

Merged
merged 1 commit into from
Oct 25, 2024
Merged

[AUTO] Update native headers to rtc_4.5.0 #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions headers/rtc_4.5.0/include/AgoraBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
#include <stdio.h>
#include <string.h>
#include <cassert>
#include <string>
#include <vector>

#include "IAgoraParameter.h"
#include "AgoraMediaBase.h"
Expand Down Expand Up @@ -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`.
Expand All @@ -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)
Expand All @@ -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) {}

};
Expand All @@ -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.
Expand Down Expand Up @@ -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) {}
};

/**
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions headers/rtc_4.5.0/include/rte_base/rte_cpp_player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};

/**
Expand Down
Loading