Compare commits
8 Commits
v0.3.0-rc.
...
v0.3.0-rc.
| Author | SHA1 | Date | |
|---|---|---|---|
| fa1985c99c | |||
| 5c80277851 | |||
| e862703c6c | |||
| 81fbe447fe | |||
| f0abaaff6a | |||
| 9a71f7c903 | |||
| 87a1f348be | |||
| ecb1cbbb91 |
@@ -13,7 +13,7 @@ export const useDevices = createGlobalState(() => {
|
|||||||
return navigator.mediaDevices.getDisplayMedia({
|
return navigator.mediaDevices.getDisplayMedia({
|
||||||
audio: false,
|
audio: false,
|
||||||
video: {
|
video: {
|
||||||
width: { max: 2560 },
|
width: { max: 1920 },
|
||||||
height: { max: 1080 },
|
height: { max: 1080 },
|
||||||
displaySurface: 'monitor',
|
displaySurface: 'monitor',
|
||||||
frameRate: { ideal: fps, max: fps },
|
frameRate: { ideal: fps, max: fps },
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ interface SpeakingClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const ICE_SERVERS: RTCIceServer[] = [
|
const ICE_SERVERS: RTCIceServer[] = [
|
||||||
|
{ urls: 'stun:stunserver2025.stunprotocol.org:3478' },
|
||||||
{ urls: 'stun:stun.l.google.com:19302' },
|
{ urls: 'stun:stun.l.google.com:19302' },
|
||||||
{ urls: 'stun:stun.l.google.com:5349' },
|
{ urls: 'stun:stun.l.google.com:5349' },
|
||||||
{ urls: 'stun:stun1.l.google.com:3478' },
|
{ urls: 'stun:stun1.l.google.com:3478' },
|
||||||
@@ -88,6 +89,9 @@ export const useMediasoup = createSharedComposable(() => {
|
|||||||
|
|
||||||
await device.value.load({ routerRtpCapabilities: rtpCapabilities.value! })
|
await device.value.load({ routerRtpCapabilities: rtpCapabilities.value! })
|
||||||
|
|
||||||
|
console.log('SERVER RTP CAPABILITIES', rtpCapabilities.value)
|
||||||
|
console.log('СОГЛАСОВАННЫЕ', device.value.rtpCapabilities)
|
||||||
|
|
||||||
// Send transport
|
// Send transport
|
||||||
{
|
{
|
||||||
const transportInfo = await signaling.socket.value.emitWithAck('createTransport', { producing: true, consuming: false })
|
const transportInfo = await signaling.socket.value.emitWithAck('createTransport', { producing: true, consuming: false })
|
||||||
@@ -383,6 +387,8 @@ export const useMediasoup = createSharedComposable(() => {
|
|||||||
if (!track)
|
if (!track)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
track.contentHint = 'speech'
|
||||||
|
|
||||||
await createProducer({
|
await createProducer({
|
||||||
track,
|
track,
|
||||||
streamId: 'mic-video',
|
streamId: 'mic-video',
|
||||||
@@ -427,6 +433,8 @@ export const useMediasoup = createSharedComposable(() => {
|
|||||||
if (!track)
|
if (!track)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
track.contentHint = 'detail'
|
||||||
|
|
||||||
await createProducer({
|
await createProducer({
|
||||||
track,
|
track,
|
||||||
streamId: 'mic-video',
|
streamId: 'mic-video',
|
||||||
@@ -453,17 +461,19 @@ export const useMediasoup = createSharedComposable(() => {
|
|||||||
|
|
||||||
const track = stream.getVideoTracks()[0]
|
const track = stream.getVideoTracks()[0]
|
||||||
|
|
||||||
console.log('settings', track.getSettings())
|
|
||||||
|
|
||||||
if (!track)
|
if (!track)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
console.log('settings', track.getSettings())
|
||||||
|
track.contentHint = 'motion'
|
||||||
|
|
||||||
await createProducer({
|
await createProducer({
|
||||||
track,
|
track,
|
||||||
streamId: 'share',
|
streamId: 'share',
|
||||||
codec: device.value.rtpCapabilities.codecs?.find(
|
codec: device.value.rtpCapabilities.codecs?.find(
|
||||||
c => c.mimeType.toLowerCase() === 'video/h264',
|
c => c.mimeType.toLowerCase() === 'video/h264',
|
||||||
),
|
),
|
||||||
|
// c => c.mimeType.toLowerCase() === 'video/h264' && c.parameters['profile-level-id'] === '42e01f',
|
||||||
// codec: device.value.rtpCapabilities.codecs?.find(
|
// codec: device.value.rtpCapabilities.codecs?.find(
|
||||||
// c => c.mimeType.toLowerCase() === 'video/av1',
|
// c => c.mimeType.toLowerCase() === 'video/av1',
|
||||||
// ),
|
// ),
|
||||||
@@ -491,8 +501,8 @@ export const useMediasoup = createSharedComposable(() => {
|
|||||||
],
|
],
|
||||||
codecOptions: {
|
codecOptions: {
|
||||||
// videoGoogleStartBitrate: 8000,
|
// videoGoogleStartBitrate: 8000,
|
||||||
videoGoogleMaxBitrate: 120000,
|
// videoGoogleMaxBitrate: 120000,
|
||||||
videoGoogleMinBitrate: 2000,
|
// videoGoogleMinBitrate: 2000,
|
||||||
},
|
},
|
||||||
zeroRtpOnPause: true,
|
zeroRtpOnPause: true,
|
||||||
appData: {
|
appData: {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
"$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
|
||||||
"productName": "Chad",
|
"productName": "Chad",
|
||||||
"version": "0.3.0-rc.5",
|
"version": "0.3.0-rc.7",
|
||||||
"identifier": "xyz.koptilnya.chad",
|
"identifier": "xyz.koptilnya.chad",
|
||||||
"build": {
|
"build": {
|
||||||
"frontendDist": "../.output/public",
|
"frontendDist": "../.output/public",
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ export const autoConfig: mediasoup.types.RouterOptions = {
|
|||||||
mimeType: 'audio/opus',
|
mimeType: 'audio/opus',
|
||||||
clockRate: 48000,
|
clockRate: 48000,
|
||||||
channels: 2,
|
channels: 2,
|
||||||
parameters: { useinbandfec: 1, stereo: 1 },
|
parameters: { useinbandfec: 0, stereo: 1 },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
kind: 'video',
|
kind: 'video',
|
||||||
@@ -42,17 +42,17 @@ export const autoConfig: mediasoup.types.RouterOptions = {
|
|||||||
clockRate: 90000,
|
clockRate: 90000,
|
||||||
parameters: {},
|
parameters: {},
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
kind: 'video',
|
// kind: 'video',
|
||||||
mimeType: 'video/h264',
|
// mimeType: 'video/h264',
|
||||||
clockRate: 90000,
|
// clockRate: 90000,
|
||||||
parameters: {
|
// parameters: {
|
||||||
'packetization-mode': 1,
|
// 'packetization-mode': 1,
|
||||||
'profile-level-id': '640032',
|
// 'profile-level-id': '640032',
|
||||||
'level-asymmetry-allowed': 1,
|
// 'level-asymmetry-allowed': 1,
|
||||||
'x-google-start-bitrate': 12000,
|
// 'x-google-start-bitrate': 12000,
|
||||||
},
|
// },
|
||||||
},
|
// },
|
||||||
{
|
{
|
||||||
kind: 'video',
|
kind: 'video',
|
||||||
mimeType: 'video/h264',
|
mimeType: 'video/h264',
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import type { types } from 'mediasoup'
|
import type { types } from 'mediasoup'
|
||||||
|
import type { Transport } from 'mediasoup/types'
|
||||||
import type { Server as SocketServer } from 'socket.io'
|
import type { Server as SocketServer } from 'socket.io'
|
||||||
import type {
|
import type {
|
||||||
ChadClient,
|
ChadClient,
|
||||||
@@ -196,7 +197,7 @@ export default async function (io: SocketServer, router: types.Router) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const producer = await transport.produce({ kind, rtpParameters, appData: { ...appData, socketId: socket.id } })
|
const producer = await (transport as Transport).produce({ kind, rtpParameters, appData: { ...appData, socketId: socket.id } })
|
||||||
|
|
||||||
socket.data.producers.set(producer.id, producer)
|
socket.data.producers.set(producer.id, producer)
|
||||||
|
|
||||||
@@ -404,7 +405,7 @@ export default async function (io: SocketServer, router: types.Router) {
|
|||||||
{
|
{
|
||||||
producerId: producer.id,
|
producerId: producer.id,
|
||||||
rtpCapabilities: consumerSocket.data.rtpCapabilities,
|
rtpCapabilities: consumerSocket.data.rtpCapabilities,
|
||||||
enableRtx: false,
|
enableRtx: true,
|
||||||
paused: true,
|
paused: true,
|
||||||
ignoreDtx: true,
|
ignoreDtx: true,
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user