Skip to content

Commit

Permalink
fix(config): Remove the deprecated configs. (#13500)
Browse files Browse the repository at this point in the history
* fix(config): Remove the deprecated configs.
Add the new codec selection settings for desktop and mobile endpoints.

* fix(config): Use the new codec selection settings for RN.

* Address review comments.

* chore(deps) Update lib-jitsi-meet@latest.
jitsi/lib-jitsi-meet@v1649.0.0+17ade96a...v1652.0.0+90da4884.
  • Loading branch information
jallamsetty1 authored and hristoterezov committed Jul 18, 2023
1 parent 8049bec commit 3a48fd4
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 48 deletions.
59 changes: 35 additions & 24 deletions config.js
Original file line number Diff line number Diff line change
Expand Up @@ -427,25 +427,9 @@ var config = {

// Specify the settings for video quality optimizations on the client.
// videoQuality: {
// // Provides a way to prevent a video codec from being negotiated on the JVB connection. The codec specified
// // here will be removed from the list of codecs present in the SDP answer generated by the client. If the
// // same codec is specified for both the disabled and preferred option, the disable settings will prevail.
// // Note that 'VP8' cannot be disabled since it's a mandatory codec, the setting will be ignored in this case.
// disabledCodec: 'H264',
//
// // Provides a way to set a preferred video codec for the JVB connection. If 'H264' is specified here,
// // simulcast will be automatically disabled since JVB doesn't support H264 simulcast yet. This will only
// // rearrange the the preference order of the codecs in the SDP answer generated by the browser only if the
// // preferred codec specified here is present. Please ensure that the JVB offers the specified codec for this
// // to take effect.
// preferredCodec: 'VP8',
//
// // Provides a way to enforce the preferred codec for the conference even when the conference has endpoints
// // that do not support the preferred codec. For example, older versions of Safari do not support VP9 yet.
// // This will result in Safari not being able to decode video from endpoints sending VP9 video.
// // When set to false, the conference falls back to VP8 whenever there is an endpoint that doesn't support the
// // preferred codec and goes back to the preferred codec when that endpoint leaves.
// enforcePreferredCodec: false,
// // Provides a way to set the codec preference on desktop based endpoints.
// codecPreferenceOrder: [ 'VP9', 'VP8', 'H264' ],
//
// // Provides a way to configure the maximum bitrates that will be enforced on the simulcast streams for
// // video tracks. The keys in the object represent the type of the stream (LD, SD or HD) and the values
Expand Down Expand Up @@ -485,6 +469,24 @@ var config = {
// 720: 'high',
// },
//
// // Provides a way to set the codec preference on mobile devices, both on RN and mobile browser based endpoint
// mobileCodecPreferenceOrder: [ 'VP8', 'VP9', 'H264' ],
//
// // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
// // Provides a way to prevent a video codec from being negotiated on the JVB connection. The codec specified
// // here will be removed from the list of codecs present in the SDP answer generated by the client. If the
// // same codec is specified for both the disabled and preferred option, the disable settings will prevail.
// // Note that 'VP8' cannot be disabled since it's a mandatory codec, the setting will be ignored in this case.
// disabledCodec: 'H264',
//
// // DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
// // Provides a way to set a preferred video codec for the JVB connection. If 'H264' is specified here,
// // simulcast will be automatically disabled since JVB doesn't support H264 simulcast yet. This will only
// // rearrange the the preference order of the codecs in the SDP answer generated by the browser only if the
// // preferred codec specified here is present. Please ensure that the JVB offers the specified codec for this
// // to take effect.
// preferredCodec: 'VP8',
//
// },

// Notification timeouts
Expand Down Expand Up @@ -935,12 +937,12 @@ var config = {
// If not set, the effective value is 'all'.
// iceTransportPolicy: 'all',

// Provides a way to set the video codec preference on the p2p connection. Acceptable
// codec values are 'VP8', 'VP9' and 'H264'.
// preferredCodec: 'H264',

// Provides a way to prevent a video codec from being negotiated on the p2p connection.
// disabledCodec: '',
// Provides a way to set the codec preference on mobile devices, both on RN and mobile browser based
// endpoints.
// mobileCodecPreferenceOrder: [ 'H264', 'VP8', 'VP9' ],
//
// Provides a way to set the codec preference on desktop based endpoints.
// codecPreferenceOrder: [ 'VP9', 'VP8', 'H264 ],

// How long we're going to wait, before going back to P2P after the 3rd
// participant has left the conference (to filter out page reload).
Expand All @@ -952,6 +954,15 @@ var config = {
// { urls: 'stun:jitsi-meet.example.com:3478' },
{ urls: 'stun:meet-jit-si-turnrelay.jitsi.net:443' },
],

// DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
// Provides a way to set the video codec preference on the p2p connection. Acceptable
// codec values are 'VP8', 'VP9' and 'H264'.
// preferredCodec: 'H264',

// DEPRECATED! Use `codecPreferenceOrder/mobileCodecPreferenceOrder` instead.
// Provides a way to prevent a video codec from being negotiated on the p2p connection.
// disabledCodec: '',
},

analytics: {
Expand Down
10 changes: 5 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"js-md5": "0.6.1",
"js-sha512": "0.8.0",
"jwt-decode": "2.2.0",
"lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1649.0.0+17ade96a/lib-jitsi-meet.tgz",
"lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1652.0.0+90da4884/lib-jitsi-meet.tgz",
"lodash": "4.17.21",
"moment": "2.29.4",
"moment-duration-format": "2.2.2",
Expand Down
9 changes: 4 additions & 5 deletions react/features/base/config/configType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -441,10 +441,10 @@ export interface IConfig {
opusMaxAverageBitrate?: number;
p2p?: {
backToP2PDelay?: number;
disabledCodec?: string;
codecPreferenceOrder?: Array<string>;
enabled?: boolean;
iceTransportPolicy?: string;
preferredCodec?: string;
mobileCodecPreferenceOrder?: Array<string>;
stunServers?: Array<{ urls: string; }>;
};
participantsPane?: {
Expand Down Expand Up @@ -545,8 +545,7 @@ export interface IConfig {
useHostPageLocalStorage?: boolean;
useTurnUdp?: boolean;
videoQuality?: {
disabledCodec?: string;
enforcePreferredCodec?: boolean;
codecPreferenceOrder?: Array<string>;
maxBitratesVideo?: {
[key: string]: {
high?: number;
Expand All @@ -557,8 +556,8 @@ export interface IConfig {
minHeightForQualityLvl?: {
[key: number]: string;
};
mobileCodecPreferenceOrder?: Array<string>;
persist?: boolean;
preferredCodec?: string;
};
webhookProxyUrl?: string;
webrtcIceTcpDisable?: boolean;
Expand Down
1 change: 0 additions & 1 deletion react/features/base/config/configWhitelist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,6 @@ export default [
'p2p',
'participantsPane',
'pcStatsInterval',
'preferredCodec',
'prejoinConfig',
'prejoinPageEnabled',
'recordingService',
Expand Down
12 changes: 0 additions & 12 deletions react/features/base/config/reducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,6 @@ const INITIAL_NON_RN_STATE: IConfig = {
* @type {Object}
*/
const INITIAL_RN_STATE: IConfig = {
// FIXME: Mobile codecs should probably be configurable separately, rather
// FIXME: than requiring this override here...

p2p: {
disabledCodec: 'vp9',
preferredCodec: 'h264'
},

videoQuality: {
disabledCodec: 'vp9',
preferredCodec: 'vp8'
}
};

/**
Expand Down

0 comments on commit 3a48fd4

Please sign in to comment.