Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Dev/4.5.2 #450

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

Merged
merged 25 commits into from
Apr 23, 2025
Merged

Dev/4.5.2 #450

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
5ac4b05
[Android] update gradle to 8.4
alienzh Mar 11, 2025
5da4388
[Android] Fxs The worker thread calls writeLog and sendCustomReportMe…
alienzh Mar 11, 2025
585ced9
[Android] update ci.
alienzh Mar 11, 2025
b06df45
[Android] update ci.
alienzh Mar 11, 2025
a739c07
[Android] update ci.
alienzh Mar 11, 2025
f5a106f
[Android] update startForegroundService.
alienzh Mar 25, 2025
10e1760
[Android] update ci.
alienzh Mar 25, 2025
bf2ec32
[Android] update ci.
alienzh Mar 25, 2025
6655e03
[Android] update audio notification.
alienzh Mar 26, 2025
8e6908f
update 4.5.2
alienzh Mar 26, 2025
710cb7f
Merge branch 'dev/android_update_compilesdk' into dev/4.5.2
alienzh Mar 26, 2025
ba20dab
[Android] update .h file
alienzh Mar 26, 2025
2d03af4
Fix screen sharing issue
Mar 27, 2025
22b849b
fix local composite issues
Mar 27, 2025
0b6475b
[Android] bugfisx
alienzh Mar 27, 2025
794cc42
Modify the copy.
Mar 27, 2025
e3e166a
Add certificate error prompt for facial capture feature.
Mar 27, 2025
932e07e
Fix media encryption bug
Mar 27, 2025
74bef6e
Merge branch 'dev/4.5.2' of https://github.com/AgoraIO/API-Examples i…
Mar 27, 2025
6d424f3
[Android] fix compose Audio Route change
alienzh Mar 27, 2025
0e603ae
Fix the bug that encrypted videos do not interoperate between iOS and…
Mar 27, 2025
1052d2b
Merge branch 'dev/4.5.2' of https://github.com/AgoraIO/API-Examples i…
Mar 27, 2025
5d97099
[Android] update beauty
alienzh Mar 27, 2025
b88e9f4
[windows]fix rte player url
HugoChaan Apr 11, 2025
deef6ba
update to 4.5.2.
Apr 22, 2025
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
Prev Previous commit
Next Next commit
[Android] update .h file
  • Loading branch information
@alienzh
alienzh committed Mar 26, 2025
commit ba20dab0d607ac637ba65661e1a5984c4084c4d5
3 changes: 2 additions & 1 deletion Android/APIExample/agora-simple-filter/src/main/cpp/AgoraRtcKit/AgoraBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2706,6 +2706,7 @@ enum AUDIO_SCENARIO_TYPE {
AUDIO_SCENARIO_MEETING = 8,
/**
* 9: AI Server.
* @technical preview
*/
AUDIO_SCENARIO_AI_SERVER = 9,
/**
Expand Down Expand Up @@ -6537,7 +6538,7 @@ enum THREAD_PRIORITY_TYPE {
CRITICAL = 5,
};

#if defined(__ANDROID__) || (defined(__APPLE__) && TARGET_OS_IOS)
#if defined(__ANDROID__) || (defined(__APPLE__) && (TARGET_OS_IOS || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)))

/**
* The video configuration for the shared screen stream.
Expand Down
7 changes: 7 additions & 0 deletions Android/APIExample/agora-simple-filter/src/main/cpp/AgoraRtcKit/AgoraMediaBase.h
View file
Open in desktop
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
4 changes: 4 additions & 0 deletions Android/APIExample/agora-simple-filter/src/main/cpp/AgoraRtcKit/AgoraMediaPlayerTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ enum MEDIA_PLAYER_EVENT {
/** Triggered when retrying to open media fails
*/
PLAYER_EVENT_TRY_OPEN_FAILED = 18,
/** Triggered when an http redirect occurs
* @technical preview
*/
PLAYER_EVENT_HTTP_REDIRECT = 19,
};

/**
Expand Down
2 changes: 1 addition & 1 deletion Android/APIExample/agora-simple-filter/src/main/cpp/AgoraRtcKit/NGIAgoraCameraCapturer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ class ICameraCapturer : public RefCountInterface {
*/
virtual int setCameraExposureFactor(float value, aosl_ref_t ares = AOSL_REF_INVALID) = 0;

#if (defined(__APPLE__) && TARGET_OS_IOS)
#if (defined(__APPLE__) && (TARGET_OS_IOS || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)))
/**
* Enables or disables the AVCaptureMultiCamSession.
*
Expand Down
3 changes: 2 additions & 1 deletion Android/APIExample/agora-stream-encrypt/src/main/cpp/include/agora/AgoraBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2706,6 +2706,7 @@ enum AUDIO_SCENARIO_TYPE {
AUDIO_SCENARIO_MEETING = 8,
/**
* 9: AI Server.
* @technical preview
*/
AUDIO_SCENARIO_AI_SERVER = 9,
/**
Expand Down Expand Up @@ -6537,7 +6538,7 @@ enum THREAD_PRIORITY_TYPE {
CRITICAL = 5,
};

#if defined(__ANDROID__) || (defined(__APPLE__) && TARGET_OS_IOS)
#if defined(__ANDROID__) || (defined(__APPLE__) && (TARGET_OS_IOS || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)))

/**
* The video configuration for the shared screen stream.
Expand Down
7 changes: 7 additions & 0 deletions Android/APIExample/agora-stream-encrypt/src/main/cpp/include/agora/AgoraMediaBase.h
View file
Open in desktop
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
4 changes: 4 additions & 0 deletions Android/APIExample/agora-stream-encrypt/src/main/cpp/include/agora/AgoraMediaPlayerTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,10 @@ enum MEDIA_PLAYER_EVENT {
/** Triggered when retrying to open media fails
*/
PLAYER_EVENT_TRY_OPEN_FAILED = 18,
/** Triggered when an http redirect occurs
* @technical preview
*/
PLAYER_EVENT_HTTP_REDIRECT = 19,
};

/**
Expand Down
18 changes: 10 additions & 8 deletions Android/APIExample/agora-stream-encrypt/src/main/cpp/include/agora/IAgoraRtcEngine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ enum CLOUD_PROXY_TYPE {
/** Camera capturer configuration.*/
struct CameraCapturerConfiguration {
/** Camera direction settings (for Android/iOS only). See: #CAMERA_DIRECTION. */
#if defined(__ANDROID__) || (defined(__APPLE__) && TARGET_OS_IOS)
#if defined(__ANDROID__) || (defined(__APPLE__) && (TARGET_OS_IOS || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)))
/**
* The camera direction.
*/
Expand Down Expand Up @@ -2122,7 +2122,7 @@ class IRtcEngineEventHandler {
(void)width;
(void)height;
}
#if defined(__ANDROID__) || (defined(__APPLE__) && TARGET_OS_IOS)
#if defined(__ANDROID__) || (defined(__APPLE__) && (TARGET_OS_IOS || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)))
/**
* Reports the face detection result of the local user.
*
Expand Down Expand Up @@ -4008,7 +4008,7 @@ class IRtcEngine : public agora::base::IEngineBase {
*/
virtual int stopEchoTest() = 0;

#if defined(__APPLE__) && TARGET_OS_IOS
#if defined(__APPLE__) && (TARGET_OS_IOS || (defined(TARGET_OS_VISION) && TARGET_OS_VISION))
/** Enables the SDK use AVCaptureMultiCamSession or AVCaptureSession. Applies to iOS 13.0+ only.
* @param enabled Whether to enable multi-camera when capturing video:
* - true: Enable multi-camera, and the SDK uses AVCaptureMultiCamSession.
Expand Down Expand Up @@ -6706,7 +6706,9 @@ class IRtcEngine : public agora::base::IEngineBase {
*/
virtual int destroyCustomEncodedVideoTrack(video_track_id_t video_track_id) = 0;

#if defined(__ANDROID__) || (defined(__APPLE__) && TARGET_OS_IOS)

#if defined(__ANDROID__) || (defined(__APPLE__) && (TARGET_OS_IOS || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)))

/**
* Switches between front and rear cameras.
*
Expand Down Expand Up @@ -6982,7 +6984,7 @@ class IRtcEngine : public agora::base::IEngineBase {
*/
virtual int setRouteInCommunicationMode(int route) = 0;

#endif // __ANDROID__ || (__APPLE__ && TARGET_OS_IOS)
#endif // __ANDROID__ || (__APPLE__ && (TARGET_OS_IOS || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)))

#if defined(__APPLE__)
/**
Expand Down Expand Up @@ -7018,7 +7020,7 @@ class IRtcEngine : public agora::base::IEngineBase {
*/
virtual IScreenCaptureSourceList* getScreenCaptureSources(const SIZE& thumbSize, const SIZE& iconSize, const bool includeScreen) = 0;
#endif // _WIN32 || (__APPLE__ && !TARGET_OS_IPHONE && TARGET_OS_MAC)
#if (defined(__APPLE__) && TARGET_OS_IOS)
#if (defined(__APPLE__) && (TARGET_OS_IOS || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)))
/** Sets the operational permission of the SDK on the audio session.
*
* The SDK and the app can both configure the audio session by default. If
Expand All @@ -7044,7 +7046,7 @@ class IRtcEngine : public agora::base::IEngineBase {
* - < 0: Failure.
*/
virtual int setAudioSessionOperationRestriction(AUDIO_SESSION_OPERATION_RESTRICTION restriction) = 0;
#endif // __APPLE__ && TARGET_OS_IOS
#endif // __APPLE__ && (TARGET_OS_IOS || (defined(TARGET_OS_VISION) && TARGET_OS_VISION))

#if defined(_WIN32) || (defined(__APPLE__) && !TARGET_OS_IPHONE && TARGET_OS_MAC)

Expand Down Expand Up @@ -7185,7 +7187,7 @@ class IRtcEngine : public agora::base::IEngineBase {
virtual int updateScreenCaptureParameters(const ScreenCaptureParameters& captureParams) = 0;
#endif // _WIN32 || (__APPLE__ && !TARGET_OS_IPHONE && TARGET_OS_MAC)

#if defined(__ANDROID__) || (defined(__APPLE__) && TARGET_OS_IOS)
#if defined(__ANDROID__) || (defined(__APPLE__) && (TARGET_OS_IOS || (defined(TARGET_OS_VISION) && TARGET_OS_VISION)))
/**
* Starts screen sharing.
*
Expand Down
Loading
Loading