Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit 8e6bd7d

Browse files
authored
Av1x changed to AV1 and chrome100+ subscription AV1 failed due to payload… (#1227)
1 parent 02a5ff5 commit 8e6bd7d

File tree

5 files changed

+21
-8
lines changed

5 files changed

+21
-8
lines changed

source/agent/conference/conference.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const {EventEmitter} = require('events');
6464
* }
6565
*
6666
* object(VideoFormat):: {
67-
* codec: 'h264' | 'vp8' | 'h265' | 'vp9' | 'av1x',
67+
* codec: 'h264' | 'vp8' | 'h265' | 'vp9' | 'av1',
6868
* profile: 'constrained-baseline' | 'baseline' | 'main' | 'high' | undefined
6969
* }
7070
*

source/agent/video/videoCapability.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ module.exports.detected = (requireHWAcc) => {
2222
var useHW = false;
2323
// TODO: support av1x.
2424
var codecs = {
25-
decode: ['vp8', 'vp9', 'h264', 'h265','av1','av1x'],
26-
encode: ['vp8', 'vp9','av1' ,'av1x']
25+
decode: ['vp8', 'vp9', 'h264', 'h265', 'av1'],
26+
encode: ['vp8', 'vp9', 'av1']
2727
};
2828

2929
if (requireHWAcc && isHWAccAppliable()) {

source/agent/webrtc/mediaConfig.js

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,20 @@ const h265 = {
9494
],
9595
};
9696

97+
const av1 = {
98+
payloadType: 35,
99+
encodingName: 'AV1',
100+
clockRate: 90000,
101+
channels: 1,
102+
mediaType: 'video',
103+
feedbackTypes: [
104+
'ccm fir',
105+
'nack',
106+
'transport-cc',
107+
'goog-remb',
108+
],
109+
};
110+
97111
const red = {
98112
payloadType: 116,
99113
encodingName: 'red',
@@ -219,7 +233,7 @@ const telephoneevent = {
219233
const mediaConfig = {
220234
default: {
221235
rtpMappings: {
222-
vp8, vp9, h264, h265, red, rtx,
236+
vp8, vp9, h264, h265, av1, red, rtx,
223237
opus, pcmu, pcma, isac16, isac32, g722, ilbc,
224238
ulpfec, telephoneevent
225239
},

source/core/owt_base/MediaFramePipeline.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ inline FrameFormat getFormat(const std::string& codec) {
107107
return owt_base::FRAME_FORMAT_VP9;
108108
} else if (codec == "h265") {
109109
return owt_base::FRAME_FORMAT_H265;
110-
} else if (codec == "av1x") {
110+
} else if (codec == "av1") {
111111
return owt_base::FRAME_FORMAT_AV1;
112112
} else if (codec == "pcm_48000_2" || codec == "pcm_raw") {
113113
return owt_base::FRAME_FORMAT_PCM_48000_2;

source/management_console/public/js/App.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,6 @@ class RoomModal extends React.Component {
605605
'vp8': {codec: 'vp8'},
606606
'vp9': {codec: 'vp9'},
607607
'av1': {codec: 'av1'}, //for chrome95+
608-
'av1x': {codec: 'av1x'},
609608
// audio
610609
'opus': {codec: 'opus', sampleRate: 48000, channelNum: 2},
611610
'isac-16000': {codec: 'isac', sampleRate: 16000},
@@ -704,7 +703,7 @@ class RoomModal extends React.Component {
704703
return mediaCheckBox(name, 'mediaIn.audio');
705704
});
706705

707-
const videoNames = ['h264', 'h265', 'vp8', 'vp9','av1','av1x'];
706+
const videoNames = ['h264', 'h265', 'vp8', 'vp9','av1'];
708707
const videoCheckBoxes = videoNames.map((name) => {
709708
return mediaCheckBox(name, 'mediaIn.video');
710709
});
@@ -750,7 +749,7 @@ class RoomModal extends React.Component {
750749
'h264-baseline',
751750
'h264-main',
752751
'h264-high',
753-
'h265', 'vp8', 'vp9', 'av1x',
752+
'h265', 'vp8', 'vp9', 'av1',
754753
];
755754
const videoCheckBoxes = videoNames.map((name) => {
756755
return mediaCheckBox(name, 'mediaOut.video.format');

0 commit comments

Comments
 (0)