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.

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

upgrade new head file #56

Merged
merged 1 commit into from
Mar 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions headers/rtc_4.2.6.7/include/AgoraBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -1320,6 +1320,18 @@ enum AUDIO_CODEC_TYPE {
* 12: LPCNET.
*/
AUDIO_CODEC_LPCNET = 12,
/**
* 13: 4 channels opus.
*/
AUDIO_CODEC_OPUS4C = 13,
/**
* 14: 6 channels opus.
*/
AUDIO_CODEC_OPUS6C = 14,
/**
* 15: 8 channels opus.
*/
AUDIO_CODEC_OPUS8C = 15,
};

/**
Expand Down
71 changes: 71 additions & 0 deletions headers/rtc_4.2.6.7/include/IAgoraRtcEngine.h
Original file line number Diff line number Diff line change
Expand Up @@ -3404,6 +3404,53 @@ struct DirectCdnStreamingMediaOptions {
*/
Optional<video_track_id_t> customVideoTrackId;

#if defined(_WIN32) || (defined(__APPLE__) && TARGET_OS_MAC && !TARGET_OS_IPHONE)
/**
* Whether to publish the captured video from the screen:
* This parameter is for macOS and Windows only.
* - `true`: Publish the captured video from the screen.
* - `false`: (Default) Do not publish the captured video from the screen.
*/
Optional<bool> publishScreenTrack;
/**
* Whether to publish the captured video from the secondary screen:
* This parameter is for macOS and Windows only.
* - true: Publish the captured video from the secondary screen.
* - false: (Default) Do not publish the captured video from the secondary screen.
*/
Optional<bool> publishSecondaryScreenTrack;
/**
* Whether to publish the captured video from the third screen:
* This parameter is for macOS and Windows only.
* - true: Publish the captured video from the third screen.
* - false: (Default) Do not publish the captured video from the third screen.
*/
Optional<bool> publishThirdScreenTrack;
/**
* Whether to publish the captured video from the fourth screen:
* This parameter is for macOS and Windows only.
* - true: Publish the captured video from the fourth screen.
* - false: (Default) Do not publish the captured video from the fourth screen.
*/
Optional<bool> publishFourthScreenTrack;

/**
* Whether to publish the audio played by the local loopback device.
* This parameter is for macOS and Windows only.
* - `true`: Publish the audio track of local loopback track.
* - `false`: (Default) Do not publish the local loopback track.
*/
Optional<bool> publishLoopbackAudioTrack;

/**
* Pointer to the device name of the sound card. The default value is NULL (the default sound card).
* - This parameter is for macOS and Windows only.
* - macOS does not support loopback capturing of the default sound card. If you need to use this method,
* please use a virtual sound card and pass its name to the publishLoopbackDeviceName. Agora has tested and recommends using soundflower.
*/
Optional<const char*> publishLoopbackDeviceName;
#endif

DirectCdnStreamingMediaOptions() {}
~DirectCdnStreamingMediaOptions() {}

Expand All @@ -3416,6 +3463,14 @@ struct DirectCdnStreamingMediaOptions {
SET_FROM(publishMediaPlayerAudioTrack);
SET_FROM(publishMediaPlayerId);
SET_FROM(customVideoTrackId);
#if defined(_WIN32) || (defined(__APPLE__) && TARGET_OS_MAC && !TARGET_OS_IPHONE)
SET_FROM(publishScreenTrack);
SET_FROM(publishSecondaryScreenTrack);
SET_FROM(publishThirdScreenTrack);
SET_FROM(publishFourthScreenTrack);
SET_FROM(publishLoopbackAudioTrack);
SET_FROM(publishLoopbackDeviceName);
#endif
#undef SET_FROM
}

Expand All @@ -3432,6 +3487,14 @@ struct DirectCdnStreamingMediaOptions {
ADD_COMPARE(publishMediaPlayerAudioTrack);
ADD_COMPARE(customVideoTrackId);
ADD_COMPARE(publishMediaPlayerId);
#if defined(_WIN32) || (defined(__APPLE__) && TARGET_OS_MAC && !TARGET_OS_IPHONE)
ADD_COMPARE(publishScreenTrack);
ADD_COMPARE(publishSecondaryScreenTrack);
ADD_COMPARE(publishThirdScreenTrack);
ADD_COMPARE(publishFourthScreenTrack);
ADD_COMPARE(publishLoopbackAudioTrack);
ADD_COMPARE(publishLoopbackDeviceName);
#endif
END_COMPARE();

#undef BEGIN_COMPARE
Expand All @@ -3451,6 +3514,14 @@ struct DirectCdnStreamingMediaOptions {
REPLACE_BY(publishMediaPlayerAudioTrack);
REPLACE_BY(customVideoTrackId);
REPLACE_BY(publishMediaPlayerId);
#if defined(_WIN32) || (defined(__APPLE__) && TARGET_OS_MAC && !TARGET_OS_IPHONE)
REPLACE_BY(publishScreenTrack);
REPLACE_BY(publishSecondaryScreenTrack);
REPLACE_BY(publishThirdScreenTrack);
REPLACE_BY(publishFourthScreenTrack);
REPLACE_BY(publishLoopbackAudioTrack);
REPLACE_BY(publishLoopbackDeviceName);
#endif
#undef REPLACE_BY
}
return *this;
Expand Down
Loading