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

Jump to bottom

Add optional encoding params to publish #224

Merged
merged 1 commit into from
Nov 4, 2021
Merged

Add optional encoding params to publish #224

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,11 @@ export default class Client {
return this.transports[Role.sub].pc.getStats(selector);
}

publish(stream: LocalStream) {
publish(stream: LocalStream, encodingParams?: RTCRtpEncodingParameters[]) {
if (!this.transports) {
throw Error(ERR_NO_SESSION);
}
stream.publish(this.transports[Role.pub]);
stream.publish(this.transports[Role.pub], encodingParams);
}

createDataChannel(label: string) {
Expand Down
81 changes: 40 additions & 41 deletions src/stream.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ export class LocalStream extends MediaStream {
constraints: Constraints;
pc?: RTCPeerConnection;
api?: RTCDataChannel;
encodingParams?: RTCRtpEncodingParameters[];

constructor(stream: MediaStream, constraints: Constraints) {
super(stream);
Expand Down Expand Up @@ -203,50 +204,47 @@ export class LocalStream extends MediaStream {

private publishTrack(track: MediaStreamTrack) {
if (this.pc) {
if (track.kind === 'video' && this.constraints.simulcast) {
const idx = resolutions.indexOf(this.constraints.resolution);
const encodings: RTCRtpEncodingParameters[] = [
{
rid: 'f',
maxBitrate: VideoConstraints[resolutions[idx]].encodings.maxBitrate,
maxFramerate: VideoConstraints[resolutions[idx]].encodings.maxFramerate,
},
];

if (idx - 1 >= 0) {
encodings.push({
rid: 'h',
scaleResolutionDownBy: 2.0,
maxBitrate: VideoConstraints[resolutions[idx - 1]].encodings.maxBitrate,
maxFramerate: VideoConstraints[resolutions[idx - 1]].encodings.maxFramerate,
});
}
const init: RTCRtpTransceiverInit = {
streams: [this],
direction: 'sendonly',
};
if (track.kind === 'video') {
if (this.encodingParams) {
init.sendEncodings = this.encodingParams
} else if (this.constraints.simulcast) {
const idx = resolutions.indexOf(this.constraints.resolution);
const encodings: RTCRtpEncodingParameters[] = [
{
rid: 'f',
maxBitrate: VideoConstraints[resolutions[idx]].encodings.maxBitrate,
maxFramerate: VideoConstraints[resolutions[idx]].encodings.maxFramerate,
},
];

if (idx - 1 >= 0) {
encodings.push({
rid: 'h',
scaleResolutionDownBy: 2.0,
maxBitrate: VideoConstraints[resolutions[idx - 1]].encodings.maxBitrate,
maxFramerate: VideoConstraints[resolutions[idx - 1]].encodings.maxFramerate,
});
}

if (idx - 2 >= 0) {
encodings.push({
rid: 'q',
scaleResolutionDownBy: 4.0,
maxBitrate: VideoConstraints[resolutions[idx - 2]].encodings.maxBitrate,
maxFramerate: VideoConstraints[resolutions[idx - 2]].encodings.maxFramerate,
});
}
const transceiver = this.pc.addTransceiver(track, {
streams: [this],
direction: 'sendonly',
sendEncodings: encodings,
});
this.setPreferredCodec(transceiver, track.kind);
} else {
const init: RTCRtpTransceiverInit = {
streams: [this],
direction: 'sendonly',
};
if (track.kind === 'video') {
if (idx - 2 >= 0) {
encodings.push({
rid: 'q',
scaleResolutionDownBy: 4.0,
maxBitrate: VideoConstraints[resolutions[idx - 2]].encodings.maxBitrate,
maxFramerate: VideoConstraints[resolutions[idx - 2]].encodings.maxFramerate,
});
}
init.sendEncodings = encodings
} else {
init.sendEncodings = [VideoConstraints[this.constraints.resolution].encodings];
}
const transceiver = this.pc.addTransceiver(track, init);
this.setPreferredCodec(transceiver, track.kind);
}
const transceiver = this.pc.addTransceiver(track, init);
this.setPreferredCodec(transceiver, track.kind);
}
}

Expand Down Expand Up @@ -327,9 +325,10 @@ export class LocalStream extends MediaStream {
return stream.getVideoTracks()[0];
}

publish(transport: Transport) {
publish(transport: Transport, encodingParams?: RTCRtpEncodingParameters[]) {
this.pc = transport.pc;
this.api = transport.api;
this.encodingParams = encodingParams;
this.getTracks().forEach(this.publishTrack.bind(this));
}

Expand Down