Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
680048f
feat: upgrade to 3.2.0
LichKing-2234 Dec 2, 2020
4ee51a9
feat: upgrade to 3.2.0
LichKing-2234 Dec 2, 2020
fcb57cc
feat: upgrade to 3.2.0
LichKing-2234 Dec 2, 2020
642eb32
Merge branch 'master' into dev/3.2.0
LichKing-2234 Dec 2, 2020
e10a633
update en doc
TingChen2020 Dec 3, 2020
984d807
Merge pull request #305 from TingChen2020/dev/3.2.0
LichKing-2234 Dec 4, 2020
76c3a08
update docs
TingChen2020 Dec 15, 2020
daef6ff
Merge pull request #311 from TingChen2020/dev/3.2.0
LichKing-2234 Dec 15, 2020
3a55997
feat: add `setClientRole(role: ClientRole, options?: ClientRoleOption…
LichKing-2234 Dec 15, 2020
2fef3ae
feat: add `setClientRole(role: ClientRole, options?: ClientRoleOption…
LichKing-2234 Dec 15, 2020
721604e
feat: add `setClientRole(role: ClientRole, options?: ClientRoleOption…
LichKing-2234 Dec 15, 2020
da3222a
Merge branch 'master' into dev/3.2.0
LichKing-2234 Dec 15, 2020
7a53134
Update doc
TingChen2020 Dec 16, 2020
561b3fd
Merge branch 'master' into dev/3.2.0
LichKing-2234 Dec 17, 2020
ddeaefb
Merge branch 'master' into dev/3.2.0
LichKing-2234 Dec 17, 2020
6ebc3a1
minor editorial improvement
TingChen2020 Dec 17, 2020
d73653c
minor changes
TingChen2020 Dec 18, 2020
daefc68
style: use shorthand arguments for lambda
LichKing-2234 Dec 18, 2020
56ab25b
fix: `MetadataReceived` event parameters bug
LichKing-2234 Dec 18, 2020
9ab28a7
fix: `MetadataReceived` event parameters bug
LichKing-2234 Dec 18, 2020
a290e73
fix: use the better way to fix rendering problems
LichKing-2234 Dec 18, 2020
75f572d
fix: use the better way to fix rendering problems
LichKing-2234 Dec 18, 2020
c8a08e5
Merge branch 'master' into dev/3.2.0
LichKing-2234 Dec 18, 2020
de52ca6
Merge branch 'master' into dev/3.2.0
LichKing-2234 Dec 18, 2020
558cc61
merge: dev/3.2.0
LichKing-2234 Dec 18, 2020
eb257ec
Merge commit 'c8a08e551ad150f3f52c5c5864e5b80255d6505a' into dev/3.2.0
LichKing-2234 Dec 18, 2020
1966cd8
Merge branch 'rc/3.1.+' into dev/3.2.0
LichKing-2234 Dec 18, 2020
10da71d
docs: Update docs
LichKing-2234 Dec 18, 2020
76403e8
Merge branch 'master' into dev/3.2.0
LichKing-2234 Dec 21, 2020
f301dc4
chore: release 3.2.0-rc.0
LichKing-2234 Dec 21, 2020
503c14d
Add doc changes between v3.1.2 and v3.2.0
TingChen2020 Dec 21, 2020
ac146fa
Merge pull request #315 from TingChen2020/dev/3.2.0
LichKing-2234 Dec 22, 2020
3dcc489
feat: upgrade native SDK to 3.2.1
LichKing-2234 Dec 23, 2020
a98f6bd
chore: release 3.2.0
LichKing-2234 Dec 23, 2020
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
4 changes: 4 additions & 0 deletions src/common/Classes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1227,6 +1227,10 @@ export interface RemoteAudioStats {
networkTransportDelay: number;
/**
* Network delay (ms) from the receiver to the jitter buffer.
*
* **Note**
*
* When the receiver is an audience member and `AudienceLatencyLevelType` is `1`, this parameter does not take effect.
*/
jitterBufferDelay: number;
/**
Expand Down
38 changes: 19 additions & 19 deletions src/common/Enums.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1162,7 +1162,7 @@ export enum ErrorCode {
*/
PublishStreamNotFound = 155,
/**
* 156: The format of the RTMP stream URL is not supported. Check whether the URL format is correct.
* 156: The format of the RTMP or RTMPS stream URL is not supported. Check whether the URL format is correct.
*/
PublishStreamFormatNotSuppported = 156,
/**
Expand Down Expand Up @@ -1537,7 +1537,7 @@ export enum NetworkType {
*/
export enum RtmpStreamingErrorCode {
/**
* 0: The RTMP streaming publishes successfully.
* 0: The RTMP or RTMPS streaming publishes successfully.
*/
OK = 0,
/**
Expand All @@ -1547,23 +1547,23 @@ export enum RtmpStreamingErrorCode {
*/
InvalidParameters = 1,
/**
* 2: The RTMP streaming is encrypted and cannot be published.
* 2: The RTMP or RTMPS streaming is encrypted and cannot be published.
*/
EncryptedStreamNotAllowed = 2,
/**
* 3: Timeout for the RTMP streaming. Call the [`addPublishStreamUrl`]{@link RtcEngine.addPublishStreamUrl} method to publish the streaming again.
* 3: Timeout for the RTMP or RTMPS streaming. Call the [`addPublishStreamUrl`]{@link RtcEngine.addPublishStreamUrl} method to publish the streaming again.
*/
ConnectionTimeout = 3,
/**
* 4: An error occurs in Agora’s streaming server. Call the [`addPublishStreamUrl`]{@link RtcEngine.addPublishStreamUrl} method to publish the streaming again.
*/
InternalServerError = 4,
/**
* 5: An error occurs in the RTMP server.
* 5: An error occurs in the CDN server.
*/
RtmpServerError = 5,
/**
* 6: The RTMP streaming publishes too frequently.
* 6: The RTMP or RTMPS streaming publishes too frequently.
*/
TooOften = 6,
/**
Expand All @@ -1575,36 +1575,36 @@ export enum RtmpStreamingErrorCode {
*/
NotAuthorized = 8,
/**
* 9: Agora’s server fails to find the RTMP streaming.
* 9: Agora’s server fails to find the RTMP or RTMPS streaming.
*/
StreamNotFound = 9,
/**
* 10: The format of the RTMP streaming URL is not supported. Check whether the URL format is correct.
* 10: The format of the RTMP or RTMPS streaming URL is not supported. Check whether the URL format is correct.
*/
FormatNotSupported = 10,
}

/**
* The RTMP streaming state.
* The RTMP or RTMPS streaming state.
*/
export enum RtmpStreamingState {
/**
* 0: The RTMP streaming has not started or has ended. This state is also triggered after you
* remove an RTMP address from the CDN by calling [`removePublishStreamUrl`]{@link RtcEngine.removePublishStreamUrl}.
* 0: The RTMP or RTMPS streaming has not started or has ended. This state is also triggered after you
* remove an RTMP or RTMPS stream* from the CDN by calling [`removePublishStreamUrl`]{@link RtcEngine.removePublishStreamUrl}.
*/
Idle = 0,
/**
* 1: The SDK is connecting to Agora’s streaming server and the RTMP server.
* 1: The SDK is connecting to Agora’s streaming server and the CDN server.
* This state is triggered after you call the [`addPublishStreamUrl`]{@link RtcEngine.addPublishStreamUrl} method.
*/
Connecting = 1,
/**
* 2: The RTMP streaming is being published. The SDK successfully publishes the RTMP streaming and returns this state.
* 2: The RTMP or RTMPS streaming is being published. The SDK successfully publishes the RTMP or RTMPS streaming and returns this state.
*/
Running = 2,
/**
* 3: The RTMP streaming is recovering. When exceptions occur to the CDN, or the streaming is interrupted,
* the SDK attempts to resume RTMP streaming and returns this state.
* 3: The RTMP or RTMPS streaming is recovering. When exceptions occur to the CDN, or the streaming is interrupted,
* the SDK attempts to resume RTMP or RTMPS streaming and returns this state.
*
* - If the SDK successfully resumes the streaming, [`Running`]{@link RtmpStreamingState.Running} returns.
* - If the streaming does not resume within 60 seconds or server errors occur,
Expand All @@ -1614,8 +1614,8 @@ export enum RtmpStreamingState {
*/
Recovering = 3,
/**
* 4: The RTMP streaming fails. See the errorCode parameter for the detailed error information.
* You can also call the [`addPublishStreamUrl`]{@link RtcEngine.addPublishStreamUrl} method to publish the RTMP streaming again.
* 4: The RTMP or RTMPS streaming fails. See the errorCode parameter for the detailed error information.
* You can also call the [`addPublishStreamUrl`]{@link RtcEngine.addPublishStreamUrl} method to publish the RTMP or RTMPS streaming again.
*/
Failure = 4,
}
Expand Down Expand Up @@ -2355,11 +2355,11 @@ export enum StreamSubscribeState {
}

/**
* Events during the RTMP streaming.
* Events during the RTMP or RTMPS streaming.
*/
export enum RtmpStreamingEvent {
/**
* 1: An error occurs when you add a background image or a watermark image to the RTMP stream.
* 1: An error occurs when you add a background image or a watermark image to the RTMP or RTMPS stream.
*/
FailedLoadImage = 1,
}
Expand Down
22 changes: 13 additions & 9 deletions src/common/RtcChannel.native.ts
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,9 @@ export default class RtcChannel implements RtcChannelInterface {
}

/**
* Publishes the local stream to the CDN.
* Publishes the local stream to a specified CDN streaming URL.
*
* After calling this method, you can push media streams in RTMP or RTMPS protocol to the CDN.
*
* This method call triggers the [`RtmpStreamingStateChanged`]{@link RtcChannelEvents.RtmpStreamingStateChanged}
* callback on the local client to report the state of adding a local stream to the CDN.
Expand All @@ -507,10 +509,11 @@ export default class RtcChannel implements RtcChannelInterface {
* - Ensure that you enable the RTMP Converter service before using this function. See Prerequisites in *Push Streams to CDN*.
* - Ensure that the user joins a channel before calling this method.
* - This method can only be called by a host in a `LiveBroadcasting` channel.
* - This method adds only one stream HTTP/HTTPS URL address each time it is called.
* - This method adds only one CDN streaming URL each time it is called.
* - Agora supports pushing media streams in RTMPS protocol to the CDN only when you enable transcoding.
*
* @param url The CDN streaming URL in the RTMP format. The maximum length of this parameter is 1024 bytes. The URL address must not contain special characters, such as Chinese language characters.
* @param transcodingEnabled Sets whether transcoding is enabled/disabled. If you set this parameter as true,
* @param url The CDN streaming URL in the RTMP or RTMPS format. The maximum length of this parameter is 1024 bytes. The URL address must not contain special characters, such as Chinese language characters.
* @param transcodingEnabled Whether to enable transcoding. If you set this parameter as true,
* ensure that you call the [`setLiveTranscoding`]{@link RtcChannel.setLiveTranscoding} method before this method.
* - `true`: Enable transcoding. To transcode the audio or video streams when publishing them to CDN live, often used for combining the audio and video streams of multiple hosts in CDN live.
* - `false`: Disable transcoding.
Expand All @@ -526,17 +529,17 @@ export default class RtcChannel implements RtcChannelInterface {
}

/**
* Removes an RTMP stream from the CDN.
* Removes an RTMP or RTMPS stream from the CDN.
*
* This method removes the RTMP URL address (added by [`addPublishStreamUrl`]{@link RtcChannel.addPublishStreamUrl}) from a CDN live stream.
* This method removes the CDN streaming URL (added by [`addPublishStreamUrl`]{@link RtcChannel.addPublishStreamUrl}) from a CDN live stream.
* The SDK reports the result of this method call in the [`RtmpStreamingStateChanged`]{@link RtcChannelEvents.RtmpStreamingStateChanged} callback.
*
* **Note**
* - Ensure that you enable the RTMP Converter service before using this function. See Prerequisites in *Push Streams to CDN*.
* - This method can only be called by a host in a `LiveBroadcasting` channel.
* - This method removes only one stream HTTP/HTTPS URL address each time it is called.
* - This method removes only one CDN streaming URL each time it is called.
*
* @param url The RTMP URL address to be removed. The maximum length of this parameter is 1024 bytes. The URL address must not contain special characters,
* @param url The CDN streaming URL to be removed. The maximum length of this parameter is 1024 bytes. The URL address must not contain special characters,
* such as Chinese language characters.
*/
removePublishStreamUrl(url: string): Promise<void> {
Expand All @@ -555,6 +558,7 @@ export default class RtcChannel implements RtcChannelInterface {
* - Ensure that the user joins a channel before calling this method.
* - This method can only be called by a host in a `LiveBroadcasting` channel.
* - Ensure that you call this method before calling the [`addPublishStreamUrl`]{@link RtcChannel.addPublishStreamUrl} method.
* - Agora supports pushing media streams in RTMPS protocol to the CDN only when you enable transcoding.
*
* @param transcoding Sets the CDN live audio/video transcoding settings.
*/
Expand Down Expand Up @@ -727,7 +731,7 @@ export default class RtcChannel implements RtcChannelInterface {
* All users in the same channel must use the same encryption mode and encryption key. Once all users leave the channel, the encryption key of this channel is automatically cleared.
*
* **Note**
* - If you enable the built-in encryption, you cannot use the RTMP streaming function.
* - If you enable the built-in encryption, you cannot use the RTMP or RTMPS streaming function.
* - Agora supports four encryption modes. If you choose an encryption mode (excepting `SM4128ECB` mode), you need to add an external encryption library when integrating the SDK. For details, see the advanced guide *Channel Encryption*.
*
*
Expand Down
Loading