Skip to content

Commit 4e125d4

Browse files
guoxianzhesda-rob
guoxianzhe
and
sda-rob
authored
feat: adapt nativeSDK to 4.2.6.3 (#1148)
* chore: upgrade native sdk to 4.2.6.3 * chore: upgrade terra config * [AUTO] Generate codes by terra (#1147) Co-authored-by: guoxianzhe <[email protected]> * chore: set startPreviewWithoutSourceType --------- Co-authored-by: sda-rob <[email protected]> Co-authored-by: guoxianzhe <[email protected]>
1 parent 5c02520 commit 4e125d4

11 files changed

+81
-18
lines changed

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"yuv-canvas": "1.2.6"
137137
},
138138
"agora_electron": {
139-
"iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.6.121-build.1_DCG_Windows_Video_20231215_0426.zip",
140-
"iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.6.121-build.1_DCG_Mac_Video_20231215_0431.zip"
139+
"iris_sdk_win": "https://download.agora.io/sdk/release/iris_4.2.6.3-build.1_DCG_Windows_Video_20231227_0710.zip",
140+
"iris_sdk_mac": "https://download.agora.io/sdk/release/iris_4.2.6.3-build.1_DCG_Mac_Video_20231227_0710.zip"
141141
}
142142
}

‎scripts/terra/code_config.yaml

+10-11
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,23 @@ parsers:
33
package: '@agoraio-extensions/terra-legacy-cxx-parser'
44
args:
55
includeHeaderDirs:
6-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.2/include'
6+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.3/include'
77
parseFiles:
88
include:
9-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.2/include/*.h'
9+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.3/include/*.h'
1010
exclude:
11-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.2/include/AgoraRefPtr.h'
12-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.2/include/time_utils.h'
13-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.2/include/AgoraOptional.h'
14-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.2/include/AgoraRefPtr.h'
15-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.2/include/IAgoraH265Transcoder.h'
16-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.2/include/IAgoraMediaComponentFactory.h'
17-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.2/include/IAgoraParameter.h'
11+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.3/include/AgoraRefPtr.h'
12+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.3/include/time_utils.h'
13+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.3/include/AgoraOptional.h'
14+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.3/include/AgoraRefPtr.h'
15+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.3/include/IAgoraH265Transcoder.h'
16+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.3/include/IAgoraMediaComponentFactory.h'
17+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.3/include/IAgoraParameter.h'
1818
customHeaders:
19-
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.2/custom_headers/*.h'
19+
- '@agoraio-extensions/terra_shared_configs:headers/rtc_4.2.6.3/custom_headers/*.h'
2020
language: ts
2121
definesMacros:
2222
- __ELECTRON__
2323
legacyRenders:
2424
- TsInterfaceRender
2525
- TsImplRender
26-

‎scripts/terra/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@agoraio-extensions/terra": "[email protected]:AgoraIO-Extensions/terra.git#commit=5dd8149d5ab9f3b472b7715916b6217f9745f066&workspace=terra",
1616
"@agoraio-extensions/terra-core": "[email protected]:AgoraIO-Extensions/terra.git#commit=5dd8149d5ab9f3b472b7715916b6217f9745f066&workspace=terra-core",
1717
"@agoraio-extensions/terra-legacy-cxx-parser": "[email protected]:AgoraIO-Extensions/terra-legacy-cxx-parser.git#commit=5455afd2c5e29013d9a3cb8d06150c162450a5ed",
18-
"@agoraio-extensions/terra_shared_configs": "[email protected]:AgoraIO-Extensions/terra_shared_configs.git#commit=1611360e8aefc3c24bcbf99d8209e7cbac9fa773",
18+
"@agoraio-extensions/terra_shared_configs": "[email protected]:AgoraIO-Extensions/terra_shared_configs.git#commit=311e37658bdbe639ada903e9af53896cd2ee84ab",
1919
"ts-node": "^10.9.1",
2020
"typescript": "^5.1.6"
2121
},

‎scripts/terra/yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -57,14 +57,14 @@ __metadata:
5757
languageName: node
5858
linkType: hard
5959

60-
"@agoraio-extensions/terra_shared_configs@[email protected]:AgoraIO-Extensions/terra_shared_configs.git#commit=1611360e8aefc3c24bcbf99d8209e7cbac9fa773":
60+
"@agoraio-extensions/terra_shared_configs@[email protected]:AgoraIO-Extensions/terra_shared_configs.git#commit=311e37658bdbe639ada903e9af53896cd2ee84ab":
6161
version: 1.0.2
62-
resolution: "@agoraio-extensions/terra_shared_configs@[email protected]:AgoraIO-Extensions/terra_shared_configs.git#commit=1611360e8aefc3c24bcbf99d8209e7cbac9fa773"
62+
resolution: "@agoraio-extensions/terra_shared_configs@[email protected]:AgoraIO-Extensions/terra_shared_configs.git#commit=311e37658bdbe639ada903e9af53896cd2ee84ab"
6363
dependencies:
6464
"@agoraio-extensions/cxx-parser": "[email protected]:AgoraIO-Extensions/terra.git#head=main&workspace=cxx-parser"
6565
"@agoraio-extensions/terra-core": "[email protected]:AgoraIO-Extensions/terra.git#head=main&workspace=terra-core"
6666
mustache: "npm:^4.2.0"
67-
checksum: 6b5b110988dc541bbd4809e523ead7a78a8df49ced4454125f9f7fc994416834ff771ccaa5acb81b95814d85258ca0e3153bcbefbb402dc0537b997220ca5ba4
67+
checksum: 5e55be729b777f6d03018140b8b8c5bb52c72a59b2962c8fbbe1cec65ddbd9f93fa17d6c73953cc89730e5e58151384007f07745b295858ee9a784257570322e
6868
languageName: node
6969
linkType: hard
7070

@@ -3450,7 +3450,7 @@ __metadata:
34503450
"@agoraio-extensions/terra": "[email protected]:AgoraIO-Extensions/terra.git#commit=5dd8149d5ab9f3b472b7715916b6217f9745f066&workspace=terra"
34513451
"@agoraio-extensions/terra-core": "[email protected]:AgoraIO-Extensions/terra.git#commit=5dd8149d5ab9f3b472b7715916b6217f9745f066&workspace=terra-core"
34523452
"@agoraio-extensions/terra-legacy-cxx-parser": "[email protected]:AgoraIO-Extensions/terra-legacy-cxx-parser.git#commit=5455afd2c5e29013d9a3cb8d06150c162450a5ed"
3453-
"@agoraio-extensions/terra_shared_configs": "[email protected]:AgoraIO-Extensions/terra_shared_configs.git#commit=1611360e8aefc3c24bcbf99d8209e7cbac9fa773"
3453+
"@agoraio-extensions/terra_shared_configs": "[email protected]:AgoraIO-Extensions/terra_shared_configs.git#commit=311e37658bdbe639ada903e9af53896cd2ee84ab"
34543454
"@types/node": "npm:^20.6.0"
34553455
ts-node: "npm:^10.9.1"
34563456
typescript: "npm:^5.1.6"

‎ts/Private/AgoraBase.ts

+12
Original file line numberDiff line numberDiff line change
@@ -2211,6 +2211,14 @@ export enum RemoteAudioStateReason {
22112211
* 7: The remote user leaves the channel.
22122212
*/
22132213
RemoteAudioReasonRemoteOffline = 7,
2214+
/**
2215+
* @ignore
2216+
*/
2217+
RemoteAudioReasonRemoteNoPacketReceive = 8,
2218+
/**
2219+
* @ignore
2220+
*/
2221+
RemoteAudioReasonRemoteLocalPlayFailed = 9,
22142222
}
22152223

22162224
/**
@@ -4677,6 +4685,10 @@ export enum EarMonitoringFilterType {
46774685
* 1<<2: Enable noise suppression to the in-ear monitor.
46784686
*/
46794687
EarMonitoringFilterNoiseSuppression = 1 << 2,
4688+
/**
4689+
* @ignore
4690+
*/
4691+
EarMonitoringFilterReusePostProcessingFilter = 1 << 15,
46804692
}
46814693

46824694
/**

‎ts/Private/AgoraMediaBase.ts

+4
Original file line numberDiff line numberDiff line change
@@ -839,6 +839,10 @@ export class AudioFrame {
839839
* @ignore
840840
*/
841841
audioTrackNumber?: number;
842+
/**
843+
* @ignore
844+
*/
845+
rtpTimestamp?: number;
842846
}
843847

844848
/**

‎ts/Private/IAgoraRtcEngine.ts

+9
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,10 @@ export class ChannelMediaOptions {
11181118
* Whether to publish the local transcoded video: true : Publish the local transcoded video. false : Do not publish the local transcoded video.
11191119
*/
11201120
publishTranscodedVideoTrack?: boolean;
1121+
/**
1122+
* @ignore
1123+
*/
1124+
publishMixedAudioTrack?: boolean;
11211125
/**
11221126
* Whether to automatically subscribe to all remote audio streams when the user joins a channel: true : Subscribe to all remote audio streams. false : Do not automatically subscribe to any remote audio streams.
11231127
*/
@@ -3201,6 +3205,11 @@ export abstract class IRtcEngine {
32013205
*/
32023206
abstract startPreview(sourceType?: VideoSourceType): number;
32033207

3208+
/**
3209+
* @ignore
3210+
*/
3211+
abstract startPreviewWithoutSourceType(): number;
3212+
32043213
/**
32053214
* Stops the local video preview.
32063215
*

‎ts/Private/IAgoraRtcEngineEx.ts

+5
Original file line numberDiff line numberDiff line change
@@ -949,4 +949,9 @@ export abstract class IRtcEngineEx extends IRtcEngine {
949949
* < 0: Failure.
950950
*/
951951
abstract startMediaRenderingTracingEx(connection: RtcConnection): number;
952+
953+
/**
954+
* @ignore
955+
*/
956+
abstract getCallIdEx(connection: RtcConnection): string;
952957
}

‎ts/Private/impl/IAgoraRtcEngineExImpl.ts

+19
Original file line numberDiff line numberDiff line change
@@ -1547,6 +1547,25 @@ export class IRtcEngineExImpl extends IRtcEngineImpl implements IRtcEngineEx {
15471547
): string {
15481548
return 'RtcEngineEx_startMediaRenderingTracingEx';
15491549
}
1550+
1551+
getCallIdEx(connection: RtcConnection): string {
1552+
const apiType = this.getApiTypeFromGetCallIdEx(connection);
1553+
const jsonParams = {
1554+
connection: connection,
1555+
toJSON: () => {
1556+
return {
1557+
connection: connection,
1558+
};
1559+
},
1560+
};
1561+
const jsonResults = callIrisApi.call(this, apiType, jsonParams);
1562+
const callId = jsonResults.callId;
1563+
return callId;
1564+
}
1565+
1566+
protected getApiTypeFromGetCallIdEx(connection: RtcConnection): string {
1567+
return 'RtcEngineEx_getCallIdEx';
1568+
}
15501569
}
15511570

15521571
import { callIrisApi } from '../internal/IrisApiEngine';

‎ts/Private/impl/IAgoraRtcEngineImpl.ts

+11
Original file line numberDiff line numberDiff line change
@@ -1508,6 +1508,17 @@ export class IRtcEngineImpl implements IRtcEngine {
15081508
return 'RtcEngine_startPreview';
15091509
}
15101510

1511+
startPreviewWithoutSourceType(): number {
1512+
const apiType = this.getApiTypeFromStartPreviewWithoutSourceType();
1513+
const jsonParams = {};
1514+
const jsonResults = callIrisApi.call(this, apiType, jsonParams);
1515+
return jsonResults.result;
1516+
}
1517+
1518+
protected getApiTypeFromStartPreviewWithoutSourceType(): string {
1519+
return 'RtcEngine_startPreviewWithoutSourceType';
1520+
}
1521+
15111522
stopPreview(
15121523
sourceType: VideoSourceType = VideoSourceType.VideoSourceCameraPrimary
15131524
): number {

‎ts/Private/internal/RtcEngineExInternal.ts

+4
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,10 @@ export class RtcEngineExInternal extends IRtcEngineExImpl {
360360
return 'RtcEngine_startPreview2';
361361
}
362362

363+
protected override getApiTypeFromStartPreviewWithoutSourceType(): string {
364+
return 'RtcEngine_startPreview';
365+
}
366+
363367
protected override getApiTypeFromStopPreview(
364368
sourceType: VideoSourceType = VideoSourceType.VideoSourceCameraPrimary
365369
): string {

0 commit comments

Comments
 (0)