fix(web): obtain media device label #10

WinterJack002 · 2024-10-21T12:48:48Z

Fix the issue where Firefox browser device list cannot be read.

WinterJack002 · 2024-10-21T12:52:05Z

Fix the issue where Firefox browser device list cannot be read, replace 'label' with 'kind+DeviceId'.

a-wing

Use English comment. please
Remove unless line
Remove unless and debug console.log
Code style

About code style:

http://www.ruanyifeng.com/blog/2012/04/javascript_programming_style.html
https://www.cnblogs.com/Yellow-ice/p/15127392.html

a-wing · 2024-10-21T13:27:05Z

webapp/components/device.tsx

@@ -11,8 +11,47 @@ import SvgAudio from './svg/audio'
 import SvgVideo from './svg/video'
 import { SvgPresentCancel, SvgPresentToAll } from './svg/present'

-export default function DeviceBar(props: { streamId: string }) {
-  const [permissionAudio, setPermissionAudio] = useState("")
+// 1.将每个设备的 deviceId 和 label 转换为可显示的格式。如果 label 为空，会使用设备类型和 deviceId 作为显示名称。


Use English comment. please

a-wing · 2024-10-21T13:27:38Z

webapp/components/device.tsx

+  return { value, text };
+}
+
+// 2.uniqByValue 去重


English comment

a-wing · 2024-10-21T13:32:10Z

webapp/components/device.tsx

@@ -48,7 +87,7 @@ export default function DeviceBar(props: { streamId: string }) {
      // NOTE:
      // Chrome: audio_capture, video_capture
      // Safari: microphone, camera
-      if (status.name === "audio_capture" || "microphone") {
+      if (status.name === "audio_capture" || "microphone") { // "microphone"作为string不一直为ture吗？


(status.name === "audio_capture" || status.name === "microphone")

a-wing · 2024-10-21T13:32:49Z

webapp/components/device.tsx

+    // 使用 deviceInfoToOption加载设备列表
+    const audios = devices.filter(i => i.kind === 'audioinput').map(deviceInfoToOption)
+
+    console.log('this is audios:',audios)


Remove this line

a-wing · 2024-10-21T13:33:47Z

webapp/components/device.tsx

+
+    const videos = devices.filter(i => i.kind === 'videoinput').map(deviceInfoToOption);
+    //const audios: Device[] = devices.filter(i => i.kind === 'audioinput')
+    //const videos: Device[] = devices.filter(i => i.kind === 'videoinput')


a-wing · 2024-10-21T13:34:11Z

webapp/components/device.tsx

+
+    // 使用 uniqByValue 去重
+  const uniqueAudios = uniqByValue(audios);
+  console.log('this is uniqueAudios:',uniqueAudios)


Remove this line

a-wing · 2024-10-21T13:35:23Z

webapp/components/device.tsx

+      } catch (error) {
+        console.error('Failed to set video device:', error)
+      }
+    }else{


a-wing · 2024-10-21T13:37:05Z

webapp/components/device.tsx

@@ -113,7 +189,7 @@ export default function DeviceBar(props: { streamId: string }) {
    setLoadingScreen(true)
    await onChangedDeviceVideo(userStatus.screen ? deviceNone.deviceId : deviceScreen.deviceId)
    setLoadingScreen(false)
-  }
+  } 


a-wing · 2024-10-21T13:49:41Z

webapp/components/device.tsx

+          console.error('Failed to set audio device:', error)
+        }
+      }
+        //await setCurrentDeviceAudio(device.value)


Remove unless line

a-wing · 2024-10-21T13:51:49Z

webapp/components/device.tsx

+      if (device) {
+        try {
+        await setCurrentDeviceVideo(device.value)
+        console.log('Video device set successfully')


try { await setCurrentDeviceVideo(device.value)

a-wing · 2024-10-22T04:30:02Z

BTW: CLA. please. https://github.com/binbat/woom/blob/main/.github/CLA.md#list-of-contributors

You can read this example: binbat/live777#95

Signed-off-by: winter_NaN <[email protected]>

WinterJack002 · 2024-10-25T18:59:45Z

I do have configured the PGP key and signed it. However, the email address in my Git configuration is not the one for GPG signing (bound to GitHub). I just changed it with git config --global user.email. The next time I submit, it should show that it is verified.

a-wing

But, this patch has some problem is no resolve

This is use this patch is firefox:

But this is live777 debugger show device in firefox

a-wing · 2024-10-26T00:10:43Z

webapp/components/device.tsx

 export default function DeviceBar(props: { streamId: string }) {
+


This blank line is unused

a-wing · 2024-10-26T00:11:51Z

webapp/components/device.tsx

-      if (device) await setCurrentDeviceAudio(device.deviceId)
+      let device = uniqueAudios[0]
+      if (device)
+        {


if (device) {

a-wing · 2024-10-26T00:12:41Z

webapp/components/device.tsx

+        {
+          try {
+            await setCurrentDeviceAudio(device.value)
+          console.log('Audio device set successfully')


Remove this log

a-wing · 2024-10-26T00:13:37Z

webapp/components/device.tsx

+      if (device) {
+        try {
+          await setCurrentDeviceVideo(device.value)
+        console.log('Video device set successfully')


Remove this successfully log

a-wing · 2024-10-26T00:14:56Z

webapp/components/device.tsx

+      console.log('no video devices:')
+      await setCurrentDeviceVideo(deviceNone.deviceId)
+
+    }


This block indent style error

a-wing · 2024-10-26T00:16:30Z

webapp/components/device.tsx

-    setDeviceAudio([...audios])
-    setDeviceVideo([...videos, deviceScreen])
+    setDeviceAudio(convertToDevice(uniqueAudios,'audioinput'))
+    setDeviceVideo(convertToDevice(uniqueVideos,'videoinput'))


convertToDevice(uniqueVideos, 'videoinput')

, after add a

a-wing · 2024-10-26T00:46:06Z

binbat/live777@1fa54d4#diff-a79fe0a1bc4d37db7cc13373925f80b8c81b4bb2ec609d32fb27d83d6c15c875R93-R96

…ck002/woom into fix/web-media-device-id

WinterJack002 · 2024-11-04T10:15:39Z

Correct the coding format and update issue solution.

fix(web): obtain media device label

2c1a3a0

a-wing requested changes Oct 21, 2024

View reviewed changes

WinterJack002 and others added 2 commits October 25, 2024 23:55

Merge branch 'binbat:main' into fix/web-media-device-id

0e4e8ab

correct code issues

b61ca19

Signed-off-by: winter_NaN <[email protected]>

a-wing requested changes Oct 26, 2024

View reviewed changes

a-wing added the bug Something isn't working label Oct 26, 2024

WinterJack002 and others added 4 commits November 4, 2024 09:10

fix firefox lable issues sec.

0889d17

deal with device lable and coding format

be04f1b

Merge branch 'binbat:main' into fix/web-media-device-id

b8f9670

Merge branch 'fix/web-media-device-id' of https://github.com/WinterJa…

6321d96

…ck002/woom into fix/web-media-device-id

a-wing added 3 commits November 5, 2024 20:16

refactor device and fix device change

290807d

fix code format

fa26950

fix deviceNone

380c2b6

a-wing merged commit 40a68b7 into binbat:main Nov 5, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(web): obtain media device label #10

fix(web): obtain media device label #10

WinterJack002 commented Oct 21, 2024

WinterJack002 commented Oct 21, 2024

a-wing left a comment

a-wing Oct 21, 2024

a-wing Oct 21, 2024

a-wing Oct 21, 2024

a-wing Oct 21, 2024

a-wing Oct 21, 2024

a-wing Oct 21, 2024

a-wing Oct 21, 2024

a-wing Oct 21, 2024

a-wing Oct 21, 2024

a-wing Oct 21, 2024

a-wing commented Oct 22, 2024 •

edited

Loading

WinterJack002 commented Oct 25, 2024

a-wing left a comment

a-wing Oct 26, 2024

a-wing Oct 26, 2024

a-wing Oct 26, 2024

a-wing Oct 26, 2024

a-wing Oct 26, 2024

a-wing Oct 26, 2024

a-wing commented Oct 26, 2024

WinterJack002 commented Nov 4, 2024

		export default function DeviceBar(props: { streamId: string }) {

fix(web): obtain media device label #10

fix(web): obtain media device label #10

Conversation

WinterJack002 commented Oct 21, 2024

WinterJack002 commented Oct 21, 2024

a-wing left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

a-wing commented Oct 22, 2024 • edited Loading

WinterJack002 commented Oct 25, 2024

a-wing left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

a-wing commented Oct 26, 2024

WinterJack002 commented Nov 4, 2024

a-wing commented Oct 22, 2024 •

edited

Loading