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

feat: support 4.2.6.19 #1234

Merged
merged 5 commits into from
Oct 17, 2024
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/terra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
generate-codes:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@
"yuv-canvas": "1.2.6"
},
"agora_electron": {
"iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.6.127-build.1_DCG_Windows_Video_Standalone_20240904_1037.zip",
"iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.6.127-build.1_DCG_Mac_Video_Standalone_20240904_1037.zip",
"native_sdk_win": "https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_rel.v4.2.6.127_26326_FULL_20240902_1553_332634.zip",
"native_sdk_mac": "https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_rel.v4.2.6.127_21780_FULL_20240902_1604_332635.zip"
"iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.6.19-build.1_DCG_Windows_Video_Standalone_20241016_0512.zip",
"iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.6.19-build.1_DCG_Mac_Video_Standalone_20241016_0512.zip",
"native_sdk_win": "https://download.agora.io/sdk/release/Agora_Native_SDK_for_Windows_rel.v4.2.6.19_26847_FULL_20241015_2119_384866.zip",
"native_sdk_mac": "https://download.agora.io/sdk/release/Agora_Native_SDK_for_Mac_rel.v4.2.6.19_22309_FULL_20241015_2005_384757.zip"
}
}
20 changes: 10 additions & 10 deletions scripts/terra/code_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ parsers:
package: '@agoraio-extensions/terra-legacy-cxx-parser'
args:
includeHeaderDirs:
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.127/include'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.19/include'
parseFiles:
include:
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.127/include/*.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.19/include/*.h'
exclude:
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.127/include/AgoraRefPtr.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.127/include/time_utils.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.127/include/AgoraOptional.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.127/include/AgoraRefPtr.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.127/include/IAgoraH265Transcoder.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.127/include/IAgoraMediaComponentFactory.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.127/include/IAgoraParameter.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.19/include/AgoraRefPtr.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.19/include/time_utils.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.19/include/AgoraOptional.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.19/include/AgoraRefPtr.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.19/include/IAgoraH265Transcoder.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.19/include/IAgoraMediaComponentFactory.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.19/include/IAgoraParameter.h'
customHeaders:
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.127/custom_headers/*.h'
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.19/custom_headers/*.h'
language: ts
definesMacros:
- __ELECTRON__
Expand Down
4 changes: 2 additions & 2 deletions ts/Private/AgoraBase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1583,7 +1583,7 @@ export enum VideoApplicationScenarioType {
*/
ApplicationScenarioGeneral = 0,
/**
* ApplicationScenarioMeeting (1) is suitable for meeting scenarios. If set to ApplicationScenarioMeeting (1), the SDK automatically enables the following strategies:
* ApplicationScenarioMeeting (1) is suitable for meeting scenarios. The SDK automatically enables the following strategies:
* In meeting scenarios where low-quality video streams are required to have a high bitrate, the SDK automatically enables multiple technologies used to deal with network congestions, to enhance the performance of the low-quality streams and to ensure the smooth reception by subscribers.
* The SDK monitors the number of subscribers to the high-quality video stream in real time and dynamically adjusts its configuration based on the number of subscribers.
* If nobody subscribers to the high-quality stream, the SDK automatically reduces its bitrate and frame rate to save upstream bandwidth.
Expand Down Expand Up @@ -2739,7 +2739,7 @@ export enum NetworkType {
*/
export enum VideoViewSetupMode {
/**
* 0: (Default) Replaces a view.
* 0: (Default) Clear all added views and replace with a new view.
*/
VideoViewSetupReplace = 0,
/**
Expand Down
4 changes: 3 additions & 1 deletion ts/Private/AgoraMediaBase.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1026,7 +1026,9 @@ export interface IFaceInfoObserver {
* pitch: Head pitch angle. A positve value means looking down, while a negative value means looking up.
* yaw: Head yaw angle. A positve value means turning left, while a negative value means turning right.
* roll: Head roll angle. A positve value means tilting to the right, while a negative value means tilting to the left.
* timestamp: String. The timestamp of the output result, in milliseconds. Here is an example of JSON: { "faces":[{ "blendshapes":{ "eyeBlinkLeft":0.9, "eyeLookDownLeft":0.0, "eyeLookInLeft":0.0, "eyeLookOutLeft":0.0, "eyeLookUpLeft":0.0, "eyeSquintLeft":0.0, "eyeWideLeft":0.0, "eyeBlinkRight":0.0, "eyeLookDownRight":0.0, "eyeLookInRight":0.0, "eyeLookOutRight":0.0, "eyeLookUpRight":0.0, "eyeSquintRight":0.0, "eyeWideRight":0.0, "jawForward":0.0, "jawLeft":0.0, "jawRight":0.0, "jawOpen":0.0, "mouthClose":0.0, "mouthFunnel":0.0, "mouthPucker":0.0, "mouthLeft":0.0, "mouthRight":0.0, "mouthSmileLeft":0.0, "mouthSmileRight":0.0, "mouthFrownLeft":0.0, "mouthFrownRight":0.0, "mouthDimpleLeft":0.0, "mouthDimpleRight":0.0, "mouthStretchLeft":0.0, "mouthStretchRight":0.0, "mouthRollLower":0.0, "mouthRollUpper":0.0, "mouthShrugLower":0.0, "mouthShrugUpper":0.0, "mouthPressLeft":0.0, "mouthPressRight":0.0, "mouthLowerDownLeft":0.0, "mouthLowerDownRight":0.0, "mouthUpperUpLeft":0.0, "mouthUpperUpRight":0.0, "browDownLeft":0.0, "browDownRight":0.0, "browInnerUp":0.0, "browOuterUpLeft":0.0, "browOuterUpRight":0.0, "cheekPuff":0.0, "cheekSquintLeft":0.0, "cheekSquintRight":0.0, "noseSneerLeft":0.0, "noseSneerRight":0.0, "tongueOut":0.0 }, "rotation":{"pitch":30.0, "yaw":25.5, "roll":-15.5}, }], "timestamp":"654879876546" }
* timestamp: String. The timestamp of the output result, in milliseconds. Here is an example of JSON:
* { "faces":[{ "blendshapes":{ "eyeBlinkLeft":0.9, "eyeLookDownLeft":0.0, "eyeLookInLeft":0.0, "eyeLookOutLeft":0.0, "eyeLookUpLeft":0.0, "eyeSquintLeft":0.0, "eyeWideLeft":0.0, "eyeBlinkRight":0.0, "eyeLookDownRight":0.0, "eyeLookInRight":0.0, "eyeLookOutRight":0.0, "eyeLookUpRight":0.0, "eyeSquintRight":0.0, "eyeWideRight":0.0, "jawForward":0.0, "jawLeft":0.0, "jawRight":0.0, "jawOpen":0.0, "mouthClose":0.0, "mouthFunnel":0.0, "mouthPucker":0.0, "mouthLeft":0.0, "mouthRight":0.0, "mouthSmileLeft":0.0, "mouthSmileRight":0.0, "mouthFrownLeft":0.0, "mouthFrownRight":0.0, "mouthDimpleLeft":0.0, "mouthDimpleRight":0.0, "mouthStretchLeft":0.0, "mouthStretchRight":0.0, "mouthRollLower":0.0, "mouthRollUpper":0.0, "mouthShrugLower":0.0, "mouthShrugUpper":0.0, "mouthPressLeft":0.0, "mouthPressRight":0.0, "mouthLowerDownLeft":0.0, "mouthLowerDownRight":0.0, "mouthUpperUpLeft":0.0, "mouthUpperUpRight":0.0, "browDownLeft":0.0, "browDownRight":0.0, "browInnerUp":0.0, "browOuterUpLeft":0.0, "browOuterUpRight":0.0, "cheekPuff":0.0, "cheekSquintLeft":0.0, "cheekSquintRight":0.0, "noseSneerLeft":0.0, "noseSneerRight":0.0, "tongueOut":0.0 }, "rotation":{"pitch":30.0, "yaw":25.5, "roll":-15.5},
* }], "timestamp":"654879876546" }
*
* @returns
* true : Facial information JSON parsing successful. false : Facial information JSON parsing failed.
Expand Down
23 changes: 11 additions & 12 deletions ts/Private/IAgoraMediaPlayer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export abstract class IMediaPlayer {
/**
* Opens the media resource.
*
* This method is called asynchronously. If you need to play a media file, make sure you receive the onPlayerSourceStateChanged callback reporting PlayerStateOpenCompleted before calling the play method to play the file.
* This method is called asynchronously.
*
* @param url The path of the media file. Both local path and online path are supported.
* @param startPos The starting position (ms) for playback. Default value is 0.
Expand All @@ -58,8 +58,6 @@ export abstract class IMediaPlayer {
/**
* Plays the media file.
*
* After calling open or seek, you can call this method to play the media file.
*
* @returns
* 0: Success.
* < 0: Failure.
Expand All @@ -78,6 +76,8 @@ export abstract class IMediaPlayer {
/**
* Stops playing the media track.
*
* After calling this method to stop playback, if you want to play again, you need to call open or openWithMediaSource to open the media resource.
*
* @returns
* 0: Success.
* < 0: Failure.
Expand All @@ -96,9 +96,8 @@ export abstract class IMediaPlayer {
/**
* Seeks to a new playback position.
*
* After successfully calling this method, you will receive the onPlayerEvent callback, reporting the result of the seek operation to the new playback position. To play the media file from a specific position, do the following:
* Call this method to seek to the position you want to begin playback.
* Call the play method to play the media file.
* If you call seek after the playback has completed (upon receiving callback onPlayerSourceStateChanged reporting playback status as PlayerStatePlaybackCompleted or PlayerStatePlaybackAllLoopsCompleted), the SDK will play the media file from the specified position. At this point, you will receive callback onPlayerSourceStateChanged reporting playback status as PlayerStatePlaying.
* If you call seek while the playback is paused, upon successful call of this method, the SDK will seek to the specified position. To resume playback, call resume or play .
*
* @param newPos The new playback position (ms).
*
Expand Down Expand Up @@ -152,8 +151,6 @@ export abstract class IMediaPlayer {
/**
* Gets the detailed information of the media stream.
*
* Call this method after calling getStreamCount.
*
* @param index The index of the media stream. This parameter must be less than the return value of getStreamCount.
*
* @returns
Expand All @@ -168,6 +165,8 @@ export abstract class IMediaPlayer {
* If you want to loop, call this method and set the number of the loops. When the loop finishes, the SDK triggers onPlayerSourceStateChanged and reports the playback state as PlayerStatePlaybackAllLoopsCompleted.
*
* @param loopCount The number of times the audio effect loops:
* ≥0: Number of times for playing. For example, setting it to 0 means no loop playback, playing only once; setting it to 1 means loop playback once, playing a total of twice.
* -1: Play the audio file in an infinite loop.
*
* @returns
* 0: Success.
Expand Down Expand Up @@ -222,9 +221,9 @@ export abstract class IMediaPlayer {
): number;

/**
* Set media player options for providing technical previews or special customization features.
* Sets media player options.
*
* The media player supports setting options through key and value. In general, you don't need to know about the option settings. You can use the default option settings of the media player. The difference between this method and setPlayerOptionInString is that the value parameter of this method is of type Int, while the value of setPlayerOptionInString is of type String. These two methods cannot be used together. Ensure that you call this method before open or openWithMediaSource.
* The media player supports setting options through key and value. The difference between this method and setPlayerOptionInString is that the value parameter of this method is of type Int, while the value of setPlayerOptionInString is of type String. These two methods cannot be used together.
*
* @param key The key of the option.
* @param value The value of the key.
Expand All @@ -236,9 +235,9 @@ export abstract class IMediaPlayer {
abstract setPlayerOptionInInt(key: string, value: number): number;

/**
* Set media player options for providing technical previews or special customization features.
* Sets media player options.
*
* Ensure that you call this method before open or openWithMediaSource. The media player supports setting options through key and value. In general, you don't need to know about the option settings. You can use the default option settings of the media player. The difference between this method and setPlayerOptionInInt is that the value parameter of this method is of type String, while the value of setPlayerOptionInInt is of type String. These two methods cannot be used together.
* The media player supports setting options through key and value. The difference between this method and setPlayerOptionInInt is that the value parameter of this method is of type String, while the value of setPlayerOptionInInt is of type String. These two methods cannot be used together.
*
* @param key The key of the option.
* @param value The value of the key.
Expand Down
14 changes: 13 additions & 1 deletion ts/Private/IAgoraMusicContentCenter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,19 @@ export interface IMusicContentCenterEventHandler {
): void;

/**
* @ignore
* 音乐资源的详细信息回调。
*
* 当你调用 getSongSimpleInfo 获取某一音乐资源的详细信息后,SDK 会触发该回调。
*
* @param reason 音乐内容中心的请求状态码,详见 MusicContentCenterStateReason 。
* @param requestId The request ID. 本次请求的唯一标识。
* @param songCode The code of the music, which is an unique identifier of the music.
* @param simpleInfo 音乐资源的相关信息,包含下列内容:
* 副歌片段的开始和结束的时间(ms)
* 副歌片段的歌词下载地址
* 副歌片段时长(ms)
* 歌曲名称
* 歌手名
*/
onSongSimpleInfoResult?(
requestId: string,
Expand Down
Loading
Loading