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.3.0 #1130

Merged
merged 66 commits into from
Feb 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
9eea872
chore: update terra config to 4.3.0
guoxianzhe Nov 30, 2023
fb67c1f
[AUTO] Generate codes by terra (#1128)
sda-rob Nov 30, 2023
c74d831
[AUTO] Update dependencies (#1129)
sda-rob Nov 30, 2023
8a2d8c1
chore(example): adapt 4.3.0
guoxianzhe Nov 30, 2023
fa0b210
chore: update agoraio-extensions/terra_shared_configs version
guoxianzhe Nov 30, 2023
46cda01
[AUTO] Generate codes by terra (#1131)
sda-rob Nov 30, 2023
9cb028f
chore: override getApiTypeFromStartPreviewWithoutSourceType
guoxianzhe Nov 30, 2023
d813ae6
Merge branch 'main' into dev/4.3.0
guoxianzhe Dec 4, 2023
f727faa
chore: upgrade terra_shared_configs
guoxianzhe Dec 5, 2023
6a234aa
chore: update terra
guoxianzhe Dec 5, 2023
e528689
[AUTO] Update dependencies (#1135)
sda-rob Dec 5, 2023
9cc51b8
chore: upgrade terra_shared_configs
guoxianzhe Dec 5, 2023
b666225
[AUTO] Generate codes by terra (#1134)
sda-rob Dec 5, 2023
cca30c5
chore: upgrade terra-legacy-cxx-parser
guoxianzhe Dec 5, 2023
e03c3f7
feat: add IH265Transcoder
guoxianzhe Dec 6, 2023
a085c7c
chore: revert
guoxianzhe Dec 6, 2023
2da2d86
fix: destroymediarecorder NMS-18021
guoxianzhe Dec 6, 2023
6105714
chore: upgrade iris_4.3.0-dev.8
guoxianzhe Dec 6, 2023
3b2535c
Merge branch 'main' into dev/4.3.0
guoxianzhe Dec 7, 2023
9722b54
chore: sendMultiVideoStream NMS-18120
guoxianzhe Dec 7, 2023
896d4a2
chore: upgrade to iris-dev.10
guoxianzhe Dec 7, 2023
231fcfe
Merge branch 'main' into dev/4.3.0
guoxianzhe Dec 8, 2023
b735692
perf: remove EncodedVideoFrame video renderer TES-14300
guoxianzhe Dec 8, 2023
0e31b97
chore: fix virtualBackground case NMS-18331
guoxianzhe Dec 11, 2023
143a21a
chore: set sourceType to VideoSourceType.VideoSourceRemote when canva…
guoxianzhe Dec 11, 2023
32936b0
chore: fix NMS-18324
guoxianzhe Dec 11, 2023
53d8f34
Merge branch 'dev/4.3.0' of ssh://github.com/AgoraIO-Extensions/Elect…
guoxianzhe Dec 11, 2023
d4c30c8
chore: upgrade iris to 4.3.0-dev.12
guoxianzhe Dec 12, 2023
b9f62d0
chore: optimize
guoxianzhe Dec 13, 2023
a884ab0
chore: optimize
guoxianzhe Dec 18, 2023
350a37c
chore: adapt new irisType
guoxianzhe Dec 20, 2023
1e7e315
chore: update iris
guoxianzhe Dec 21, 2023
19cb7c6
chore: adapt new head file
guoxianzhe Dec 27, 2023
cb3cf58
Merge branch 'main' into dev/4.3.0
guoxianzhe Jan 4, 2024
d1239a0
[terra]upgrade terra to cxx-parser (#1149)
guoxianzhe Jan 16, 2024
41f93bc
chore: upgrade for new iris api id
guoxianzhe Jan 17, 2024
979f3ee
chore: optimize
guoxianzhe Jan 17, 2024
f446dc3
chore: optimize
guoxianzhe Jan 17, 2024
713b793
chore: optimize
guoxianzhe Jan 17, 2024
bd2210d
chore: optimize
guoxianzhe Jan 17, 2024
ff745ed
chore: optimize
guoxianzhe Jan 17, 2024
e9c3ee5
chore: optimize
guoxianzhe Jan 17, 2024
7177a1c
chore: optimize
guoxianzhe Jan 17, 2024
bc1e677
chore: optimize
guoxianzhe Jan 18, 2024
fc2ea96
chore: optimize
guoxianzhe Jan 18, 2024
5025c5d
Delete scripts/terra/yarn.lock
guoxianzhe Jan 18, 2024
f7b7874
chore: optimize
guoxianzhe Jan 18, 2024
8386547
chore: optimize
guoxianzhe Jan 18, 2024
8f7b450
chore: optimize
guoxianzhe Jan 18, 2024
769f6aa
chore: optimize
guoxianzhe Jan 18, 2024
0ee25a9
chore: optimize
guoxianzhe Jan 18, 2024
a5521f0
chore: optimize
guoxianzhe Jan 23, 2024
f357c47
chore: optimize
guoxianzhe Jan 23, 2024
961c07d
chore: optimize
guoxianzhe Jan 23, 2024
f11ef8b
chore: optimize
guoxianzhe Jan 24, 2024
59c02f5
chore: optimize
guoxianzhe Jan 24, 2024
6cfae08
chore: optimize
guoxianzhe Jan 24, 2024
4541b89
chore: optimize
guoxianzhe Jan 30, 2024
15c972b
[AUTO] Generate comments by iris-doc (#1157)
sda-rob Jan 30, 2024
e53146c
chore: optimize
guoxianzhe Jan 30, 2024
19341a1
chore: optimize
guoxianzhe Feb 2, 2024
1e86832
chore: optimize
guoxianzhe Feb 2, 2024
06eff96
chore: optimize
guoxianzhe Feb 4, 2024
0526187
chore: optimize
guoxianzhe Feb 5, 2024
633bc23
chore: optimize
guoxianzhe Feb 20, 2024
612b885
Merge branch 'main' into dev/4.3.0
guoxianzhe Feb 28, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
generate-code: false
generate-comment: true
generate-comment-command: |
sh generate-prepare.sh
sh generate-comment.sh

- name: Create pull request
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/terra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
generate-code: true
generate-comment: true
generate-code-command: |
sh generate-prepare.sh
sh generate-code.sh
generate-comment-command: |
sh generate-comment.sh
Expand Down
6 changes: 1 addition & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
### VisualStudioCode template
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.vscode
*.code-workspace

# Local History for Visual Studio Code
Expand Down
2 changes: 1 addition & 1 deletion .gitleaks.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
description = "file allow lists"
paths = [
'''gitleaks.toml''',
'''plugin-(.*?)-tool.cjs''',
'''plugin-(.*?)-tools.cjs''',
'''yarn-(.*?)(.cjs)''',
]

Expand Down
8 changes: 7 additions & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,13 @@
"hardenedRuntime": true,
"identity": null,
"target": [
"zip"
{
"target": "zip",
"arch": [
"x64",
"arm64"
]
}
],
"type": "distribution"
},
Expand Down
56 changes: 33 additions & 23 deletions example/src/renderer/App.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { GithubOutlined, SettingOutlined } from '@ant-design/icons';
import { createAgoraRtcEngine } from 'agora-electron-sdk';
import { Layout, Menu } from 'antd';
import { ItemType } from 'antd/lib/menu/hooks/useItems';
import React, { Component } from 'react';
import {
Link,
Expand All @@ -20,7 +21,6 @@ import Hooks from './examples/hook';
const DATA = [Basic, Advanced, Hooks];

const { Content, Footer, Sider } = Layout;
const { SubMenu } = Menu;

class App extends Component {
state = {
Expand Down Expand Up @@ -48,28 +48,38 @@ class App extends Component {
}}
>
<div className="logo" />
<Menu theme="dark" defaultSelectedKeys={['1']} mode="inline">
<Menu.Item key="1" icon={<SettingOutlined />}>
<Link to="/">Setting</Link>
</Menu.Item>
{DATA.map((value, index) => {
return (
<SubMenu
key={`sub${index}`}
icon={<GithubOutlined />}
title={value.title}
>
{value.data.map(({ name }) => {
return (
<Menu.Item key={name}>
<Link to={`/${name}`}>{name}</Link>
</Menu.Item>
);
})}
</SubMenu>
);
})}
</Menu>
<Menu
theme="dark"
defaultSelectedKeys={['1']}
mode="inline"
//@ts-ignore
items={((): ItemType[] => {
let list = [
{
key: '1',
label: <Link to="/">Setting</Link>,
icon: <SettingOutlined />,
},
];
DATA.map((value, index) => {
let subMenu = {
key: `sub${index}`,
label: <>{value.title}</>,
icon: <GithubOutlined />,
children: [] as ItemType[],
};
value.data.map(({ name }) => {
subMenu.children.push({
key: name,
label: <Link to={`/${name}`}>{name}</Link>,
icon: <SettingOutlined />,
});
});
list.push(subMenu);
});
return list;
})()}
></Menu>
</Sider>
<Layout className="site-layout" style={{ marginLeft: 200 }}>
<Content>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {
ChannelMediaRelayError,
ChannelMediaRelayEvent,
ChannelMediaRelayState,
ChannelProfileType,
ClientRoleType,
Expand Down Expand Up @@ -96,43 +95,16 @@ export default class ChannelMediaRelay
}

/**
* Step 3-1: startChannelMediaRelay
* Step 3: startOrUpdateChannelMediaRelay
*/
startChannelMediaRelay = () => {
startOrUpdateChannelMediaRelay = () => {
const { channelId, token, uid, destChannelNames } = this.state;
if (destChannelNames.length <= 0) {
this.error('destChannelNames is invalid');
return;
}

this.engine?.startChannelMediaRelay({
// Configure src info
// Set channel name defaults to current
// Set uid defaults to local
srcInfo: { channelName: channelId, uid, token },
// Configure dest infos
destInfos: destChannelNames.map((value) => {
return {
channelName: value,
uid: 0,
token: '',
};
}),
destCount: destChannelNames.length,
});
};

/**
* Step 3-2 (Optional): updateChannelMediaRelay
*/
updateChannelMediaRelay = () => {
const { channelId, token, uid, destChannelNames } = this.state;
if (destChannelNames.length <= 0) {
this.error('destChannelNames is invalid');
return;
}

this.engine?.updateChannelMediaRelay({
this.engine?.startOrUpdateChannelMediaRelay({
// Configure src info
// Set channel name defaults to current
// Set uid defaults to local
Expand Down Expand Up @@ -210,10 +182,6 @@ export default class ChannelMediaRelay
}
}

onChannelMediaRelayEvent(code: ChannelMediaRelayEvent) {
this.info('onChannelMediaRelayEvent', 'code', code);
}

protected renderConfiguration(): ReactElement | undefined {
const { destChannelNames } = this.state;
return (
Expand Down Expand Up @@ -246,13 +214,13 @@ export default class ChannelMediaRelay
onPress={
startChannelMediaRelay
? this.stopChannelMediaRelay
: this.startChannelMediaRelay
: this.startOrUpdateChannelMediaRelay
}
/>
<AgoraButton
disabled={!startChannelMediaRelay}
title={`updateChannelMediaRelay`}
onPress={this.updateChannelMediaRelay}
onPress={this.startOrUpdateChannelMediaRelay}
/>
<AgoraButton
disabled={!startChannelMediaRelay}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
ChannelProfileType,
ClientRoleType,
IRtcEngineEventHandler,
LocalVideoStreamError,
LocalVideoStreamReason,
LocalVideoStreamState,
MediaDeviceType,
RtcConnection,
Expand Down Expand Up @@ -304,7 +304,7 @@ export default class DeviceManager
onLocalVideoStateChanged(
source: VideoSourceType,
state: LocalVideoStreamState,
error: LocalVideoStreamError
error: LocalVideoStreamReason
) {
this.info(
'onLocalVideoStateChanged',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
ChannelProfileType,
ClientRoleType,
DegradationPreference,
DirectCdnStreamingError,
DirectCdnStreamingReason,
DirectCdnStreamingState,
DirectCdnStreamingStats,
IDirectCdnStreamingEventHandler,
Expand Down Expand Up @@ -211,7 +211,7 @@ export default class DirectCdnStreaming

onDirectCdnStreamingStateChanged(
state: DirectCdnStreamingState,
error: DirectCdnStreamingError,
error: DirectCdnStreamingReason,
message: string
) {
this.info(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,10 @@ export default class EncodedVideoFrame
);
}

protected override renderUser(): undefined {
return undefined;
}

protected renderAction(): ReactElement | undefined {
const { joinChannelSuccess } = this.state;
return (
Expand Down
Loading
Loading