Skip to content

update 3.6.0.1 c++ header files #259

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
yoreland merged 1 commit into from
Feb 8, 2022
Merged

update 3.6.0.1 c++ header files #259

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
55 changes: 39 additions & 16 deletions Android/APIExample/lib-player-helper/src/main/cpp/include/AgoraBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
#include <stdlib.h>

#if defined(_WIN32)
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#define AGORA_CALL __cdecl
#if defined(AGORARTC_EXPORT)
Expand All @@ -38,6 +40,20 @@
#define AGORA_CALL
#endif

#ifdef __GNUC__
#define AGORA_GCC_VERSION_AT_LEAST(x, y) (__GNUC__ > (x) || __GNUC__ == (x) && __GNUC_MINOR__ >= (y))
#else
#define AGORA_GCC_VERSION_AT_LEAST(x, y) 0
#endif

#if AGORA_GCC_VERSION_AT_LEAST(3, 1)
#define AGORA_DEPRECATED_ATTRIBUTE __attribute__((deprecated))
#elif defined(_MSC_VER)
#define AGORA_DEPRECATED_ATTRIBUTE
#else
#define AGORA_DEPRECATED_ATTRIBUTE
#endif

namespace agora {
namespace util {

Expand Down Expand Up @@ -220,6 +236,9 @@ enum WARN_CODE_TYPE {
/** 1053: Audio Processing Module: A residual echo is detected, which may be caused by the belated scheduling of system threads or the signal overflow.
*/
WARN_APM_RESIDUAL_ECHO = 1053,
/** 1054: Audio Processing Module: AI NS is closed, this can be triggered by manual settings or by performance detection modules.
*/
WARN_APM_AINS_CLOSED = 1054,
/// @cond
WARN_ADM_WIN_CORE_NO_RECORDING_DEVICE = 1322,
/// @endcond
Expand All @@ -234,13 +253,13 @@ enum WARN_CODE_TYPE {
* - Update the sound card drive.
*/
WARN_ADM_WIN_CORE_IMPROPER_CAPTURE_RELEASE = 1324,
/** 1610: The origin resolution of the remote video is beyond the range where the super-resolution algorithm can be applied.
/** 1610: The original resolution of the remote user's video is beyond the range where super resolution can be applied.
*/
WARN_SUPER_RESOLUTION_STREAM_OVER_LIMITATION = 1610,
/** 1611: Another user is already using the super-resolution algorithm.
/** 1611: Super resolution is already being used to boost another remote user's video.
*/
WARN_SUPER_RESOLUTION_USER_COUNT_OVER_LIMITATION = 1611,
/** 1612: The device does not support the super-resolution algorithm.
/** 1612: The device does not support using super resolution.
*/
WARN_SUPER_RESOLUTION_DEVICE_NOT_SUPPORTED = 1612,
/// @cond
Expand Down Expand Up @@ -379,7 +398,8 @@ enum ERROR_CODE_TYPE {
/** 117: The data stream transmission timed out.
*/
ERR_STREAM_MESSAGE_TIMEOUT = 117,
/** 119: Switching roles fail. Please try to rejoin the channel.
/** **DEPRECATED** 119: Deprecated as of v3.6.1. Use CLIENT_ROLE_CHANGE_FAILED_REASON in the \ref agora::rtc::IRtcEngineEventHandler::onClientRoleChangeFailed "onClientRoleChangeFailed" callback instead.
* Switching roles fail. Please try to rejoin the channel.
*/
ERR_SET_CLIENT_ROLE_NOT_AUTHORIZED = 119,
/** 120: Decryption fails. The user may have used a different encryption password to join the channel. Check your settings or try rejoining the channel.
Expand Down Expand Up @@ -411,7 +431,6 @@ enum ERROR_CODE_TYPE {
ERR_ENCRYPTED_STREAM_NOT_ALLOWED_PUBLISH = 130,
/** 134: The user account is invalid. */
ERR_INVALID_USER_ACCOUNT = 134,

/** 151: CDN related errors. Remove the original URL address and add a new one by calling the \ref agora::rtc::IRtcEngine::removePublishStreamUrl "removePublishStreamUrl" and \ref agora::rtc::IRtcEngine::addPublishStreamUrl "addPublishStreamUrl" methods.
*/
ERR_PUBLISH_STREAM_CDN_ERROR = 151,
Expand All @@ -436,16 +455,13 @@ enum ERROR_CODE_TYPE {
*
*/
ERR_MODULE_NOT_FOUND = 157,
/// @cond
/** 158: The dynamical library for the super-resolution algorithm is not integrated.
* When you call the \ref agora::rtc::IRtcEngine::enableRemoteSuperResolution "enableRemoteSuperResolution" method but
* do not integrate the dynamical library for the super-resolution algorithm
* into your project, the SDK reports this error code.
*/
ERR_MODULE_SUPER_RESOLUTION_NOT_FOUND = 158,
/// @endcond

/** 160: The recording operation has been performed.
/** 160: The client is already recording audio. To start a new recording,
* call \ref agora::rtc::IRtcEngine::stopAudioRecording "stopAudioRecording" to stop
* the current recording first, and then
* call \ref agora::rtc::IRtcEngine::startAudioRecording(const AudioRecordingConfiguration&) "startAudioRecording".
*
* @since v3.4.0
*/
ERR_ALREADY_IN_RECORDING = 160,

Expand Down Expand Up @@ -708,10 +724,11 @@ enum ERROR_CODE_TYPE {
ERR_ADM_NO_PLAYOUT_DEVICE = 1360,

// VDM error code starts from 1500

/// @cond
/** 1500: Video Device Module: There is no camera device.
*/
ERR_VDM_CAMERA_NO_DEVICE = 1500,
/// @endcond

/** 1501: Video Device Module: The camera is unauthorized.
*/
Expand All @@ -735,6 +752,12 @@ enum ERROR_CODE_TYPE {
/** 1603: Video Device Module: An error occurs in setting the video encoder.
*/
ERR_VCM_ENCODER_SET_ERROR = 1603,
/** 1735: (Windows only) The Windows Audio service is disabled. You need to
* either enable the Windows Audio service or restart the device.
*
* @since v3.5.0
*/
ERR_ADM_WIN_CORE_SERVRE_SHUT_DOWN = 1735,
};

/** Output log filter level. */
Expand Down Expand Up @@ -764,7 +787,7 @@ enum LOG_FILTER_TYPE {
* @since v3.3.0
*/
enum class LOG_LEVEL {
/** 0: Do not output any log. */
/** 0x0000: Do not output any log. */
LOG_LEVEL_NONE = 0x0000,
/** 0x0001: (Default) Output logs of the FATAL, ERROR, WARN and INFO level. We recommend setting your log filter as this level.
*/
Expand Down
Loading