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.

Sign up for GitHub

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

fix(flat-rtc): track web rtc delayed remote video track #1540

Merged
merged 1 commit into from
May 30, 2022
Merged

fix(flat-rtc): track web rtc delayed remote video track #1540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions services/rtc/flat-rtc-agora-web/src/flat-rtc-agora-web.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@ export class FlatRTCAgoraWeb extends FlatRTC<FlatRTCAgoraWebUIDType> {
}

if (this.client) {
this._remoteAvatars.forEach(avatar => avatar.destroy());
this._remoteAvatars.clear();
try {
this._remoteAvatars.forEach(avatar => avatar.destroy());
this._remoteAvatars.clear();

if (this._localAvatar) {
this._localAvatar.destroy();
this._localAvatar = undefined;
}
if (this._localAvatar) {
this._localAvatar.destroy();
this._localAvatar = undefined;
}

try {
if (this.localCameraTrack) {
this.localCameraTrack.stop();
this.localCameraTrack.close();
Expand All @@ -160,12 +160,12 @@ export class FlatRTCAgoraWeb extends FlatRTC<FlatRTCAgoraWebUIDType> {
this.localMicTrack.close();
this.localMicTrack = undefined;
}

this._roomSideEffect.flushAll();
} catch (e) {
console.error(e);
// ignored
}

this._roomSideEffect.flushAll();

this._pLeavingRoom = this.client.leave();
await this._pLeavingRoom;
this._pLeavingRoom = undefined;
Expand Down
50 changes: 27 additions & 23 deletions services/rtc/flat-rtc-agora-web/src/rtc-remote-avatar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { SideEffectManager } from "side-effect-manager";
import { combine, Val } from "value-enhancer";
import type { FlatRTCAvatar } from "@netless/flat-rtc";
import type { IAgoraRTCRemoteUser } from "agora-rtc-sdk-ng";
import type { IAgoraRTCRemoteUser, IRemoteAudioTrack, IRemoteVideoTrack } from "agora-rtc-sdk-ng";

export interface RTCRemoteAvatarConfig {
rtcRemoteUser?: IAgoraRTCRemoteUser;
Expand All @@ -15,7 +15,8 @@ export class RTCRemoteAvatar implements FlatRTCAvatar {
private readonly _shouldMic$ = new Val(false);

private readonly _el$: Val<HTMLElement | undefined | null>;
private readonly _user$: Val<IAgoraRTCRemoteUser | undefined>;
private readonly _videoTrack$: Val<IRemoteVideoTrack | undefined>;
private readonly _audioTrack$: Val<IRemoteAudioTrack | undefined>;

public enableCamera(enabled: boolean): void {
this._shouldCamera$.setValue(enabled);
Expand All @@ -30,25 +31,27 @@ export class RTCRemoteAvatar implements FlatRTCAvatar {
}

public updateUser(rtcRemoteUser: IAgoraRTCRemoteUser): void {
this._user$.setValue(rtcRemoteUser);
this._videoTrack$.setValue(rtcRemoteUser.videoTrack);
this._audioTrack$.setValue(rtcRemoteUser.audioTrack);
}

public getVolumeLevel(): number {
return this._user$.value?.audioTrack?.getVolumeLevel() || 0;
return this._audioTrack$.value?.getVolumeLevel() || 0;
}

public constructor(config: RTCRemoteAvatarConfig = {}) {
this._el$ = new Val(config.element);
this._user$ = new Val(config.rtcRemoteUser);
this._videoTrack$ = new Val(config.rtcRemoteUser?.videoTrack);
this._audioTrack$ = new Val(config.rtcRemoteUser?.audioTrack);

this._sideEffect.addDisposer(
combine([this._user$, this._shouldMic$]).subscribe(([user, shouldMic]) => {
if (user && user.audioTrack) {
combine([this._audioTrack$, this._shouldMic$]).subscribe(([audioTrack, shouldMic]) => {
if (audioTrack) {
try {
if (shouldMic) {
user.audioTrack.play();
audioTrack.play();
} else {
user.audioTrack.stop();
audioTrack.stop();
}
} catch (e) {
console.error(e);
Expand All @@ -58,14 +61,14 @@ export class RTCRemoteAvatar implements FlatRTCAvatar {
);

this._sideEffect.addDisposer(
combine([this._el$, this._user$, this._shouldCamera$]).subscribe(
([el, user, shouldCamera]) => {
if (el && user && user.videoTrack) {
combine([this._el$, this._videoTrack$, this._shouldCamera$]).subscribe(
([el, videoTrack, shouldCamera]) => {
if (el && videoTrack) {
try {
if (shouldCamera) {
user.videoTrack.play(el);
videoTrack.play(el);
} else {
user.videoTrack.stop();
videoTrack.stop();
}
} catch (e) {
console.error(e);
Expand All @@ -74,18 +77,19 @@ export class RTCRemoteAvatar implements FlatRTCAvatar {
},
),
);

this._sideEffect.addDisposer(() => {
try {
this._user$.value?.videoTrack?.stop();
this._user$.value?.audioTrack?.stop();
} catch (e) {
console.error(e);
}
});
}

public destroy(): void {
this._sideEffect.flushAll();

try {
this._videoTrack$.value?.stop();
this._audioTrack$.value?.stop();
} catch (e) {
console.error(e);
}

this._videoTrack$.setValue(undefined);
this._audioTrack$.setValue(undefined);
}
}