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

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

Closed
wants to merge 1 commit into from
Closed
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
6 changes: 0 additions & 6 deletions headers/rtc_4.5.0/custom_headers/CustomIAgoraMediaEngine.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,6 @@ class IMediaEngine {
*/
virtual int unregisterFaceInfoObserver(IFaceInfoObserver* observer) = 0;

/**
* @iris_api_id: MediaEngine_setExternalRemoteEglContext_f337cbf
* @source: virtual int setExternalRemoteEglContext(void* eglContext) = 0;
*/
virtual int setExternalRemoteEglContext(const void* eglContext) = 0;

// ----------------------------- 👆🏻new API👆🏻 -----------------------------
};

Expand Down
19 changes: 0 additions & 19 deletions headers/rtc_4.5.0/custom_headers/CustomIAgoraRtcEngine.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include "AgoraBase.h"
#include "AgoraMediaBase.h"
#include "IAgoraMediaEngine.h"
#include "IAgoraMediaRecorder.h"
#include "IAgoraMusicContentCenter.h"
Expand Down Expand Up @@ -319,24 +318,6 @@ class IRtcEngine {
* @source: virtual int preloadChannel(const char* token, const char* channelId, const char* userAccount) = 0;
*/
virtual int preloadChannelWithUserAccount(const char* token, const char* channelId, const char* userAccount) = 0;

/**
* @iris_api_id: RtcEngine_takeSnapshot_1922dd1
* @source: virtual int takeSnapshot(uid_t uid, const char* filePath) = 0;
*/
virtual int takeSnapshot(uid_t uid, const char* filePath) = 0;

/**
* @iris_api_id: RtcEngine_takeSnapshot_5669ea6
* @source: virtual int takeSnapshot(uid_t uid, const agora::media::SnapshotConfig& config) = 0;
*/
virtual int takeSnapshotWithConfig(uid_t uid, const agora::media::SnapshotConfig& config) = 0;

/**
* @iris_api_id: RtcEngine_setExternalMediaProjection_f337cbf
* @source: virtual int setExternalMediaProjection(void* mediaProjection) = 0;
*/
virtual int setExternalMediaProjection(const void* mediaProjection) = 0;
};

} // namespace ext
Expand Down
19 changes: 0 additions & 19 deletions headers/rtc_4.5.0/custom_headers/CustomIAgoraRtcEngineEx.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#pragma once

#include "AgoraBase.h"
#include "AgoraMediaBase.h"
#include "IAgoraRtcEngineEx.h"

namespace agora {
Expand All @@ -18,24 +17,6 @@ class IRtcEngineEx {
virtual int leaveChannelEx(const RtcConnection &connection,
const LeaveChannelOptions *options = NULL) = 0;

/**
* @iris_api_id: RtcEngineEx_leaveChannelWithUserAccountEx_8bbe372
* @source: virtual int leaveChannelWithUserAccountEx(const char* channelId, const char* userAccount, const LeaveChannelOptions& options) = 0;
*/
virtual int leaveChannelWithUserAccountEx(const char* channelId, const char* userAccount, const LeaveChannelOptions* options = NULL) = 0;

/**
* @iris_api_id: RtcEngineEx_takeSnapshotEx_de1c015
* @source: virtual int takeSnapshotEx(const RtcConnection& connection, uid_t uid, const char* filePath) = 0;
*/
virtual int takeSnapshotEx(const RtcConnection& connection, uid_t uid, const char* filePath) = 0;

/**
* @iris_api_id: RtcEngineEx_takeSnapshotEx_b856417
* @source: virtual int takeSnapshotEx(const RtcConnection& connection, uid_t uid, const agora::media::SnapshotConfig& config) = 0;
*/
virtual int takeSnapshotWithConfigEx(const RtcConnection& connection, uid_t uid, const agora::media::SnapshotConfig& config) = 0;

/**
* @iris_api_id: RtcEngineEx_createDataStreamEx_9f641b6
* @source: virtual int createDataStreamEx(int* streamId, const DataStreamConfig& config, const RtcConnection& connection) = 0;
Expand Down
7 changes: 7 additions & 0 deletions headers/rtc_4.5.0/include/AgoraMediaBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,10 @@ struct AudioPcmFrame {
/** The channel number.
*/
size_t num_channels_;
/** @technical preview
* The audio track number. if mpk enableMultiAudioTrack, audio frame will have audio track number, eg 0 or 1.
*/
int audio_track_number_;
/** The number of bytes per sample.
*/
rtc::BYTES_PER_SAMPLE bytes_per_sample;
Expand All @@ -468,6 +472,7 @@ struct AudioPcmFrame {
bytes_per_sample = src.bytes_per_sample;
num_channels_ = src.num_channels_;
is_stereo_ = src.is_stereo_;
this->audio_track_number_ = src.audio_track_number_;

size_t length = src.samples_per_channel_ * src.num_channels_;
if (length > kMaxDataSizeSamples) {
Expand All @@ -484,6 +489,7 @@ struct AudioPcmFrame {
samples_per_channel_(0),
sample_rate_hz_(0),
num_channels_(0),
audio_track_number_(0),
bytes_per_sample(rtc::TWO_BYTES_PER_SAMPLE),
is_stereo_(false) {
memset(data_, 0, sizeof(data_));
Expand All @@ -494,6 +500,7 @@ struct AudioPcmFrame {
samples_per_channel_(src.samples_per_channel_),
sample_rate_hz_(src.sample_rate_hz_),
num_channels_(src.num_channels_),
audio_track_number_(src.audio_track_number_),
bytes_per_sample(src.bytes_per_sample),
is_stereo_(src.is_stereo_) {
size_t length = src.samples_per_channel_ * src.num_channels_;
Expand Down
Loading