Skip to content

Commit c07edd8

Browse files
author
zhangwei
committed
update 4.6.1
1 parent 1d81ec6 commit c07edd8

File tree

9 files changed

+200
-81
lines changed

9 files changed

+200
-81
lines changed

Android/APIExample-Audio/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ android.nonFinalResIds=false
2323
# read enable simple filter section on README first before set this flag to TRUE
2424
simpleFilter = false
2525

26-
rtc_sdk_version = 4.6.0
26+
rtc_sdk_version = 4.6.1

Android/APIExample-Compose/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ kotlin.code.style=official
2222
# thereby reducing the size of the R class for that library
2323
android.nonTransitiveRClass=true
2424

25-
rtc_sdk_version = 4.6.0
25+
rtc_sdk_version = 4.6.1

Android/APIExample/agora-simple-filter/src/main/cpp/AgoraRtcKit/AgoraBase.h

Lines changed: 50 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,11 @@ enum ERROR_CODE_TYPE {
560560
* fails to allocate any resource.
561561
*/
562562
ERR_RESOURCE_LIMITED = 22,
563+
/**
564+
* 23: The function is prohibited. Please allow it in the console, or contact the Agora technical support.
565+
* @technical preview
566+
*/
567+
ERR_FUNC_IS_PROHIBITED = 23,
563568
/**
564569
* 101: The App ID is invalid, usually because the data format of the App ID is incorrect.
565570
*
@@ -2266,16 +2271,8 @@ struct SimulcastConfig {
22662271
*
22672272
*/
22682273
bool publish_fallback_enable;
2269-
/**
2270-
* Whether to enable on-demand publishing. When set to true, a simulcast layer will only be published
2271-
* when there are subscribers requesting that layer.
2272-
* - true: (Default) Enable on-demand publishing.
2273-
* - false: Disable on-demand publishing. All enabled simulcast layers will be published regardless
2274-
* of subscription status.
2275-
*/
2276-
bool publish_on_demand;
22772274

2278-
SimulcastConfig(): publish_fallback_enable(false), publish_on_demand(true) {}
2275+
SimulcastConfig(): publish_fallback_enable(false) {}
22792276
};
22802277
/**
22812278
* The location of the target area relative to the screen or window. If you do not set this parameter,
@@ -2565,6 +2562,7 @@ struct WatermarkConfig {
25652562
enum MultipathMode {
25662563
/**
25672564
* Duplicate mode, the same piece of data is redundantly transmitted over all available paths.
2565+
* @technical preview
25682566
*/
25692567
Duplicate= 0,
25702568
/**
@@ -3490,8 +3488,6 @@ enum LOCAL_VIDEO_STREAM_REASON {
34903488
LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_INTERRUPTED_BY_OTHER = 32,
34913489
/* 32: (HMOS only) ScreenCapture stopped by SIM call */
34923490
LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_STOPPED_BY_CALL = 33,
3493-
/* 34: HDR Video Source fallback to SDR */
3494-
LOCAL_AUDIO_STREAM_REASON_VIDEO_SOURCE_HDR_TO_SDR = 34,
34953491
};
34963492

34973493
/**
@@ -5656,22 +5652,53 @@ struct VirtualBackgroundSource {
56565652
blur_degree(BLUR_DEGREE_HIGH) {}
56575653
};
56585654

5655+
/**
5656+
* The properties for virtual background algorithm.
5657+
*/
56595658
struct SegmentationProperty {
5659+
/** The type of algorithms for segmentation processing.
5660+
*/
56605661
enum SEG_MODEL_TYPE {
5662+
/** 1: (Default) AI segmentation algorithm.
5663+
*/
56615664
SEG_MODEL_AI = 1,
5665+
/** 2: Green screen segmentation algorithm.
5666+
*/
56625667
SEG_MODEL_GREEN = 2
56635668
};
56645669

5670+
/** The color of the screen for green screen segmentation.
5671+
*/
56655672
enum SCREEN_COLOR_TYPE {
5673+
/** 0: (Default) Automatically recognizes the screen color.
5674+
*/
56665675
SCREEN_COLOR_AUTO = 0,
5676+
/** 1: Green.
5677+
*/
56675678
SCREEN_COLOR_GREEN = 1,
5679+
/** 2: Blue.
5680+
*/
56685681
SCREEN_COLOR_BLUE = 2
56695682
};
56705683

5684+
/** The type of segmentation algorithm. See #SEG_MODEL_TYPE.
5685+
* The default value is `SEG_MODEL_AI`.
5686+
*/
56715687
SEG_MODEL_TYPE modelType;
56725688

5689+
/** The color tolerance for green screen segmentation.
5690+
*
5691+
* This parameter is only effective when `modelType` is set to `SEG_MODEL_GREEN`.
5692+
* The value ranges from 0.0 to 1.0, with a default of 0.5.
5693+
* A larger value widens the range of identifiable shades of the screen color. Setting the value too high may cause parts of the portrait to be detected as the background.
5694+
* Agora recommends dynamically adjusting this value based on the observed segmentation effect.
5695+
*/
56735696
float greenCapacity;
56745697

5698+
/** The color of the screen for green screen segmentation. See #SCREEN_COLOR_TYPE.
5699+
*
5700+
* This property is only for green screen segmentation. The default value is `SCREEN_COLOR_AUTO`.
5701+
*/
56755702
SCREEN_COLOR_TYPE screenColorType;
56765703

56775704
SegmentationProperty() : modelType(SEG_MODEL_AI), greenCapacity(0.5), screenColorType(SCREEN_COLOR_AUTO) {}
@@ -6884,7 +6911,9 @@ enum RENEW_TOKEN_ERROR_CODE {
68846911
*/
68856912
RENEW_TOKEN_SUCCESS = 0,
68866913
/**
6887-
* 1: It is recommended that the user generate a new token and retry renewToken.
6914+
* 1: The token renewal failed because of some unknown server error.
6915+
* It is recommended that the user check the parameters passed in when generating the token and
6916+
* generate a new token and retry renewToken.
68886917
*/
68896918
RENEW_TOKEN_FAILURE = 1,
68906919
/**
@@ -6893,12 +6922,18 @@ enum RENEW_TOKEN_ERROR_CODE {
68936922
*/
68946923
RENEW_TOKEN_TOKEN_EXPIRED = 2,
68956924
/**
6896-
* 3: The token renewal failed because the provided token is invalid.
6897-
* It is recommended that the user check the token generation process, generate a new token, and retry renewToken.
6925+
* 3: The token renewal failed because the token is not valid. Typical reasons include:
6926+
* - The App Certificate for the project is enabled in Agora Console, but you do not use a token
6927+
* when joining the channel. If you enable the App Certificate, you must use a token to join the
6928+
* channel.
6929+
* - The `uid` specified when calling `joinChannel` to join the channel is inconsistent with the
6930+
* `uid` passed in when generating the token.
6931+
* - The `channelName` specified when calling `joinChannel` to join the channel is inconsistent
6932+
* with the `channelName` passed in when generating the token.
68986933
*/
68996934
RENEW_TOKEN_INVALID_TOKEN = 3,
69006935
/**
6901-
* 4: The token renewal failed because the channel name in the token does not match the current channel.
6936+
* 4: The token renewal failed because the channel name is invalid.
69026937
* It is recommended that the user check the channel name, generate a new token, and retry renewToken.
69036938
*/
69046939
RENEW_TOKEN_INVALID_CHANNEL_NAME = 4,

Android/APIExample/agora-simple-filter/src/main/cpp/AgoraRtcKit/NGIAgoraRtcConnection.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,12 @@ class IRtcConnection : public RefCountInterface {
531531
* When enabled, the SDK can use multiple network paths for data transmission,
532532
* which can improve the reliability and performance of the connection.
533533
*
534+
* @note
535+
* - Permission And System Required:
536+
* - Android: Android 7.0 or later(API level 24 or later), with ACCESS_NETWORK_STATE and CHANGE_NETWORK_STATE permission.
537+
* - IOS: IOS 12.0 or later
538+
* - Macos: 10.14 or later
539+
* - Windows: Windows Vista or later
534540
* @param enable A boolean value indicating whether to enable (true) or disable (false) multipath.
535541
* @param ares A reference for asynchronous operations, defaulting to AOSL_REF_INVALID.
536542
* @return

Android/APIExample/agora-simple-filter/src/main/cpp/AgoraRtcKit/NGIAgoraVideoTrack.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ struct LocalVideoTrackStats {
326326
int height;
327327
uint32_t encoder_type;
328328
uint32_t hw_encoder_accelerating;
329+
uint32_t encoder_frame_depth;
329330
/*
330331
* encoder vender id, VideoCodecVenderId
331332
*/
@@ -349,8 +350,6 @@ struct LocalVideoTrackStats {
349350

350351
SimulcastStreamProfile simulcast_stream_profile[STREAM_LAYER_COUNT_MAX];
351352

352-
uint8_t hdr_stream_encoder;
353-
354353
LocalVideoTrackStats() : number_of_streams(0),
355354
bytes_major_stream(0),
356355
bytes_minor_stream(0),
@@ -373,12 +372,12 @@ struct LocalVideoTrackStats {
373372
height(0),
374373
encoder_type(0),
375374
hw_encoder_accelerating(0),
375+
encoder_frame_depth(8),
376376
encoder_vender_id(0),
377377
uplink_cost_time_ms(0),
378378
quality_adapt_indication(ADAPT_NONE),
379379
txPacketLossRate(0),
380-
capture_brightness_level(CAPTURE_BRIGHTNESS_LEVEL_INVALID),
381-
hdr_stream_encoder(0) {}
380+
capture_brightness_level(CAPTURE_BRIGHTNESS_LEVEL_INVALID) {}
382381
};
383382

384383
/**

Android/APIExample/agora-stream-encrypt/src/main/cpp/include/agora/AgoraBase.h

Lines changed: 50 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,11 @@ enum ERROR_CODE_TYPE {
560560
* fails to allocate any resource.
561561
*/
562562
ERR_RESOURCE_LIMITED = 22,
563+
/**
564+
* 23: The function is prohibited. Please allow it in the console, or contact the Agora technical support.
565+
* @technical preview
566+
*/
567+
ERR_FUNC_IS_PROHIBITED = 23,
563568
/**
564569
* 101: The App ID is invalid, usually because the data format of the App ID is incorrect.
565570
*
@@ -2266,16 +2271,8 @@ struct SimulcastConfig {
22662271
*
22672272
*/
22682273
bool publish_fallback_enable;
2269-
/**
2270-
* Whether to enable on-demand publishing. When set to true, a simulcast layer will only be published
2271-
* when there are subscribers requesting that layer.
2272-
* - true: (Default) Enable on-demand publishing.
2273-
* - false: Disable on-demand publishing. All enabled simulcast layers will be published regardless
2274-
* of subscription status.
2275-
*/
2276-
bool publish_on_demand;
22772274

2278-
SimulcastConfig(): publish_fallback_enable(false), publish_on_demand(true) {}
2275+
SimulcastConfig(): publish_fallback_enable(false) {}
22792276
};
22802277
/**
22812278
* The location of the target area relative to the screen or window. If you do not set this parameter,
@@ -2565,6 +2562,7 @@ struct WatermarkConfig {
25652562
enum MultipathMode {
25662563
/**
25672564
* Duplicate mode, the same piece of data is redundantly transmitted over all available paths.
2565+
* @technical preview
25682566
*/
25692567
Duplicate= 0,
25702568
/**
@@ -3490,8 +3488,6 @@ enum LOCAL_VIDEO_STREAM_REASON {
34903488
LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_INTERRUPTED_BY_OTHER = 32,
34913489
/* 32: (HMOS only) ScreenCapture stopped by SIM call */
34923490
LOCAL_VIDEO_STREAM_REASON_SCREEN_CAPTURE_STOPPED_BY_CALL = 33,
3493-
/* 34: HDR Video Source fallback to SDR */
3494-
LOCAL_AUDIO_STREAM_REASON_VIDEO_SOURCE_HDR_TO_SDR = 34,
34953491
};
34963492

34973493
/**
@@ -5656,22 +5652,53 @@ struct VirtualBackgroundSource {
56565652
blur_degree(BLUR_DEGREE_HIGH) {}
56575653
};
56585654

5655+
/**
5656+
* The properties for virtual background algorithm.
5657+
*/
56595658
struct SegmentationProperty {
5659+
/** The type of algorithms for segmentation processing.
5660+
*/
56605661
enum SEG_MODEL_TYPE {
5662+
/** 1: (Default) AI segmentation algorithm.
5663+
*/
56615664
SEG_MODEL_AI = 1,
5665+
/** 2: Green screen segmentation algorithm.
5666+
*/
56625667
SEG_MODEL_GREEN = 2
56635668
};
56645669

5670+
/** The color of the screen for green screen segmentation.
5671+
*/
56655672
enum SCREEN_COLOR_TYPE {
5673+
/** 0: (Default) Automatically recognizes the screen color.
5674+
*/
56665675
SCREEN_COLOR_AUTO = 0,
5676+
/** 1: Green.
5677+
*/
56675678
SCREEN_COLOR_GREEN = 1,
5679+
/** 2: Blue.
5680+
*/
56685681
SCREEN_COLOR_BLUE = 2
56695682
};
56705683

5684+
/** The type of segmentation algorithm. See #SEG_MODEL_TYPE.
5685+
* The default value is `SEG_MODEL_AI`.
5686+
*/
56715687
SEG_MODEL_TYPE modelType;
56725688

5689+
/** The color tolerance for green screen segmentation.
5690+
*
5691+
* This parameter is only effective when `modelType` is set to `SEG_MODEL_GREEN`.
5692+
* The value ranges from 0.0 to 1.0, with a default of 0.5.
5693+
* A larger value widens the range of identifiable shades of the screen color. Setting the value too high may cause parts of the portrait to be detected as the background.
5694+
* Agora recommends dynamically adjusting this value based on the observed segmentation effect.
5695+
*/
56735696
float greenCapacity;
56745697

5698+
/** The color of the screen for green screen segmentation. See #SCREEN_COLOR_TYPE.
5699+
*
5700+
* This property is only for green screen segmentation. The default value is `SCREEN_COLOR_AUTO`.
5701+
*/
56755702
SCREEN_COLOR_TYPE screenColorType;
56765703

56775704
SegmentationProperty() : modelType(SEG_MODEL_AI), greenCapacity(0.5), screenColorType(SCREEN_COLOR_AUTO) {}
@@ -6884,7 +6911,9 @@ enum RENEW_TOKEN_ERROR_CODE {
68846911
*/
68856912
RENEW_TOKEN_SUCCESS = 0,
68866913
/**
6887-
* 1: It is recommended that the user generate a new token and retry renewToken.
6914+
* 1: The token renewal failed because of some unknown server error.
6915+
* It is recommended that the user check the parameters passed in when generating the token and
6916+
* generate a new token and retry renewToken.
68886917
*/
68896918
RENEW_TOKEN_FAILURE = 1,
68906919
/**
@@ -6893,12 +6922,18 @@ enum RENEW_TOKEN_ERROR_CODE {
68936922
*/
68946923
RENEW_TOKEN_TOKEN_EXPIRED = 2,
68956924
/**
6896-
* 3: The token renewal failed because the provided token is invalid.
6897-
* It is recommended that the user check the token generation process, generate a new token, and retry renewToken.
6925+
* 3: The token renewal failed because the token is not valid. Typical reasons include:
6926+
* - The App Certificate for the project is enabled in Agora Console, but you do not use a token
6927+
* when joining the channel. If you enable the App Certificate, you must use a token to join the
6928+
* channel.
6929+
* - The `uid` specified when calling `joinChannel` to join the channel is inconsistent with the
6930+
* `uid` passed in when generating the token.
6931+
* - The `channelName` specified when calling `joinChannel` to join the channel is inconsistent
6932+
* with the `channelName` passed in when generating the token.
68986933
*/
68996934
RENEW_TOKEN_INVALID_TOKEN = 3,
69006935
/**
6901-
* 4: The token renewal failed because the channel name in the token does not match the current channel.
6936+
* 4: The token renewal failed because the channel name is invalid.
69026937
* It is recommended that the user check the channel name, generate a new token, and retry renewToken.
69036938
*/
69046939
RENEW_TOKEN_INVALID_CHANNEL_NAME = 4,

Android/APIExample/agora-stream-encrypt/src/main/cpp/include/agora/IAgoraMediaPlayer.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,9 @@ class IMediaPlayer : public RefCountInterface {
402402

403403
/**
404404
* Open the Agora CDN media source.
405+
*
406+
* @deprecated 4.6.0
407+
*
405408
* @param src The src of the media file that you want to play.
406409
* @param startPos The playback position (ms).
407410
* @return
@@ -412,6 +415,9 @@ class IMediaPlayer : public RefCountInterface {
412415

413416
/**
414417
* Gets the number of Agora CDN lines.
418+
*
419+
* @deprecated 4.6.0
420+
*
415421
* @return
416422
* - > 0: number of CDN.
417423
* - <= 0: Failure.
@@ -420,6 +426,9 @@ class IMediaPlayer : public RefCountInterface {
420426

421427
/**
422428
* Switch Agora CDN lines.
429+
*
430+
* @deprecated 4.6.0
431+
*
423432
* @param index Specific CDN line index.
424433
* @return
425434
* - 0: Success.
@@ -429,6 +438,9 @@ class IMediaPlayer : public RefCountInterface {
429438

430439
/**
431440
* Gets the line of the current CDN.
441+
*
442+
* @deprecated 4.6.0
443+
*
432444
* @return
433445
* - >= 0: Specific line.
434446
* - < 0: Failure.
@@ -437,6 +449,9 @@ class IMediaPlayer : public RefCountInterface {
437449

438450
/**
439451
* Enable automatic CDN line switching.
452+
*
453+
* @deprecated 4.6.0
454+
*
440455
* @param enable Whether enable.
441456
* @return
442457
* - 0: Success.
@@ -446,6 +461,9 @@ class IMediaPlayer : public RefCountInterface {
446461

447462
/**
448463
* Update the CDN source token and timestamp.
464+
*
465+
* @deprecated 4.6.0
466+
*
449467
* @param token token.
450468
* @param ts ts.
451469
* @return
@@ -456,6 +474,9 @@ class IMediaPlayer : public RefCountInterface {
456474

457475
/**
458476
* Switch the CDN source when open a media through "openWithAgoraCDNSrc" API
477+
*
478+
* @deprecated 4.6.0
479+
*
459480
* @param src Specific src.
460481
* @param syncPts Live streaming must be set to false.
461482
* @return

0 commit comments

Comments
 (0)