feat(scrcpy): add audioSource option to v2.6

yume-chan · Nov 30, 2024 · c4831e4 · c4831e4
1 parent 9e828ff
commit c4831e4
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 4 deletions.
diff --git a/libraries/adb-daemon-webusb/src/manager.spec.ts b/libraries/adb-daemon-webusb/src/manager.spec.ts
@@ -12,7 +12,45 @@ class MockUsb implements USB {
 
     getDevices = mock.fn(async () => []);
     requestDevice = mock.fn(
-        async () => ({ serialNumber: "abcdefgh" }) as never,
+        async (options?: USBDeviceRequestOptions) =>
+            ({
+                serialNumber: options?.filters?.[0]?.serialNumber ?? "abcdefgh",
+                vendorId: options?.filters?.[0]?.vendorId ?? 0x18d1,
+                productId: options?.filters?.[0]?.productId ?? 0x4e49,
+                configurations: [
+                    {
+                        configurationValue: 1,
+                        interfaces: [
+                            {
+                                interfaceNumber: 0,
+                                claimed: false,
+                                alternate: {
+                                    alternateSetting: 0,
+                                    interfaceClass:
+                                        AdbDefaultInterfaceFilter.classCode,
+                                    interfaceSubclass:
+                                        AdbDefaultInterfaceFilter.subclassCode,
+                                    interfaceProtocol:
+                                        AdbDefaultInterfaceFilter.protocolCode,
+                                    endpoints: [],
+                                },
+                                alternates: [
+                                    {
+                                        alternateSetting: 0,
+                                        interfaceClass:
+                                            AdbDefaultInterfaceFilter.classCode,
+                                        interfaceSubclass:
+                                            AdbDefaultInterfaceFilter.subclassCode,
+                                        interfaceProtocol:
+                                            AdbDefaultInterfaceFilter.protocolCode,
+                                        endpoints: [],
+                                    },
+                                ],
+                            },
+                        ],
+                    },
+                ],
+            }) satisfies Partial<USBDevice> as never,
     );
 
     addEventListener(

diff --git a/libraries/scrcpy/src/2_3/impl/init.ts b/libraries/scrcpy/src/2_3/impl/init.ts
@@ -1,5 +1,5 @@
 import type { PrevImpl } from "./prev.js";
 
 export interface Init extends Omit<PrevImpl.Init, "audioCodec"> {
-    audioCodec?: "raw" | "opus" | "aac" | "flac";
+    audioCodec?: PrevImpl.Init["audioCodec"] | "flac";
 }
diff --git a/libraries/scrcpy/src/2_6/impl/init.ts b/libraries/scrcpy/src/2_6/impl/init.ts
@@ -1,5 +1,6 @@
 import type { PrevImpl } from "./prev.js";
 
-export interface Init extends PrevImpl.Init {
+export interface Init extends Omit<PrevImpl.Init, "audioSource"> {
+    audioSource?: PrevImpl.Init["audioSource"] | "playback";
     audioDup?: boolean;
 }
diff --git a/libraries/scrcpy/src/2_6/options.ts b/libraries/scrcpy/src/2_6/options.ts
@@ -71,6 +71,10 @@ export class ScrcpyOptions2_6 implements ScrcpyOptions<Init> {
             this.value.control = false;
         }
 
+        if (this.value.audioDup) {
+            this.value.audioSource = "playback";
+        }
+
         if (this.value.control) {
             if (this.value.clipboardAutosync) {
                 this.#clipboard = new ClipboardStream();

diff --git a/libraries/scrcpy/src/2_7/options.ts b/libraries/scrcpy/src/2_7/options.ts
@@ -71,6 +71,10 @@ export class ScrcpyOptions2_7 implements ScrcpyOptions<Init> {
             this.value.control = false;
         }
 
+        if (this.value.audioDup) {
+            this.value.audioSource = "playback";
+        }
+
         if (this.value.control) {
             if (this.value.clipboardAutosync) {
                 this.#clipboard = new ClipboardStream();

diff --git a/libraries/scrcpy/src/3_0/options.ts b/libraries/scrcpy/src/3_0/options.ts
@@ -71,6 +71,10 @@ export class ScrcpyOptions3_0 implements ScrcpyOptions<Init> {
             this.value.control = false;
         }
 
+        if (this.value.audioDup) {
+            this.value.audioSource = "playback";
+        }
+
         if (this.value.control) {
             if (this.value.clipboardAutosync) {
                 this.#clipboard = new ClipboardStream();

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/toolchain/side-effect-test/package.json b/toolchain/side-effect-test/package.json
@@ -19,6 +19,7 @@
     },
     "dependencies": {
         "@yume-chan/adb": "workspace:^",
-        "@yume-chan/struct": "workspace:^"
+        "@yume-chan/struct": "workspace:^",
+        "@yume-chan/scrcpy": "workspace:^"
     }
 }
diff --git a/toolchain/side-effect-test/src/index.js b/toolchain/side-effect-test/src/index.js
@@ -30,4 +30,5 @@ u64(1);
 u8(1);
 struct({}, {});
 
+export * from "@yume-chan/scrcpy";
 export * from "@yume-chan/struct";