@yume-chan/scrcpy 0.0.13 → 0.0.16

package/src/decoder/web-codecs/index.ts

@@ -1,99 +1,99 @@
-import { WritableStream } from '@yume-chan/adb';
-import type { VideoStreamPacket } from "../../options/index.js";
-import type { H264Configuration, H264Decoder } from "../types.js";
-
-function toHex(value: number) {
-    return value.toString(16).padStart(2, '0').toUpperCase();
-}
-
-export class WebCodecsDecoder implements H264Decoder {
-    // Usually, browsers can decode most configurations,
-    // So let device choose best profile and level for itself.
-    public readonly maxProfile = undefined;
-    public readonly maxLevel = undefined;
-
-    private _writable: WritableStream<VideoStreamPacket>;
-    public get writable() { return this._writable; }
-
-    private _renderer: HTMLCanvasElement;
-    public get renderer() { return this._renderer; }
-
-    private _frameRendered = 0;
-    public get frameRendered() { return this._frameRendered; }
-
-    private context: CanvasRenderingContext2D;
-    private decoder: VideoDecoder;
-
-    // Limit FPS to system refresh rate
-    private lastFrame: VideoFrame | undefined;
-    private animationFrame: number = 0;
-
-    public constructor() {
-        this._renderer = document.createElement('canvas');
-
-        this.context = this._renderer.getContext('2d')!;
-        this.decoder = new VideoDecoder({
-            output: (frame) => {
-                if (this.lastFrame) {
-                    this.lastFrame.close();
-                }
-                this.lastFrame = frame;
-
-                if (!this.animationFrame) {
-                    // Start render loop on first frame
-                    this.render();
-                }
-            },
-            error() { },
-        });
-
-        this._writable = new WritableStream<VideoStreamPacket>({
-            write: async (packet) => {
-                switch (packet.type) {
-                    case 'configuration':
-                        this.configure(packet.data);
-                        break;
-                    case 'frame':
-                        this.decoder.decode(new EncodedVideoChunk({
-                            // Treat `undefined` as `key`, otherwise won't decode.
-                            type: packet.keyframe === false ? 'delta' : 'key',
-                            timestamp: 0,
-                            data: packet.data,
-                        }));
-                        break;
-                }
-            }
-        });
-    }
-
-    private render = () => {
-        if (this.lastFrame) {
-            this._frameRendered += 1;
-            this.context.drawImage(this.lastFrame, 0, 0);
-            this.lastFrame.close();
-            this.lastFrame = undefined;
-        }
-
-        this.animationFrame = requestAnimationFrame(this.render);
-    };
-
-    private configure(config: H264Configuration) {
-        const { profileIndex, constraintSet, levelIndex } = config;
-
-        this._renderer.width = config.croppedWidth;
-        this._renderer.height = config.croppedHeight;
-
-        // https://www.rfc-editor.org/rfc/rfc6381#section-3.3
-        // ISO Base Media File Format Name Space
-        const codec = `avc1.${[profileIndex, constraintSet, levelIndex].map(toHex).join('')}`;
-        this.decoder.configure({
-            codec: codec,
-            optimizeForLatency: true,
-        });
-    }
-
-    public dispose() {
-        cancelAnimationFrame(this.animationFrame);
-        this.decoder.close();
-    }
-}
+import { WritableStream } from '@yume-chan/adb';
+import type { VideoStreamPacket } from "../../options/index.js";
+import type { H264Configuration, H264Decoder } from "../types.js";
+
+function toHex(value: number) {
+    return value.toString(16).padStart(2, '0').toUpperCase();
+}
+
+export class WebCodecsDecoder implements H264Decoder {
+    // Usually, browsers can decode most configurations,
+    // So let device choose best profile and level for itself.
+    public readonly maxProfile = undefined;
+    public readonly maxLevel = undefined;
+
+    private _writable: WritableStream<VideoStreamPacket>;
+    public get writable() { return this._writable; }
+
+    private _renderer: HTMLCanvasElement;
+    public get renderer() { return this._renderer; }
+
+    private _frameRendered = 0;
+    public get frameRendered() { return this._frameRendered; }
+
+    private context: CanvasRenderingContext2D;
+    private decoder: VideoDecoder;
+
+    // Limit FPS to system refresh rate
+    private lastFrame: VideoFrame | undefined;
+    private animationFrame: number = 0;
+
+    public constructor() {
+        this._renderer = document.createElement('canvas');
+
+        this.context = this._renderer.getContext('2d')!;
+        this.decoder = new VideoDecoder({
+            output: (frame) => {
+                if (this.lastFrame) {
+                    this.lastFrame.close();
+                }
+                this.lastFrame = frame;
+
+                if (!this.animationFrame) {
+                    // Start render loop on first frame
+                    this.render();
+                }
+            },
+            error() { },
+        });
+
+        this._writable = new WritableStream<VideoStreamPacket>({
+            write: async (packet) => {
+                switch (packet.type) {
+                    case 'configuration':
+                        this.configure(packet.data);
+                        break;
+                    case 'frame':
+                        this.decoder.decode(new EncodedVideoChunk({
+                            // Treat `undefined` as `key`, otherwise won't decode.
+                            type: packet.keyframe === false ? 'delta' : 'key',
+                            timestamp: 0,
+                            data: packet.data,
+                        }));
+                        break;
+                }
+            }
+        });
+    }
+
+    private render = () => {
+        if (this.lastFrame) {
+            this._frameRendered += 1;
+            this.context.drawImage(this.lastFrame, 0, 0);
+            this.lastFrame.close();
+            this.lastFrame = undefined;
+        }
+
+        this.animationFrame = requestAnimationFrame(this.render);
+    };
+
+    private configure(config: H264Configuration) {
+        const { profileIndex, constraintSet, levelIndex } = config;
+
+        this._renderer.width = config.croppedWidth;
+        this._renderer.height = config.croppedHeight;
+
+        // https://www.rfc-editor.org/rfc/rfc6381#section-3.3
+        // ISO Base Media File Format Name Space
+        const codec = `avc1.${[profileIndex, constraintSet, levelIndex].map(toHex).join('')}`;
+        this.decoder.configure({
+            codec: codec,
+            optimizeForLatency: true,
+        });
+    }
+
+    public dispose() {
+        cancelAnimationFrame(this.animationFrame);
+        this.decoder.close();
+    }
+}

package/src/index.ts

@@ -1,8 +1,8 @@
-export * from './client.js';
-export * from './codec.js';
-export * from './connection.js';
-export * from './decoder/index.js';
-export * from './message.js';
-export * from './options/index.js';
-export * from './push-server.js';
-export * from './utils.js';
+export * from './client.js';
+export * from './codec.js';
+export * from './connection.js';
+export * from './decoder/index.js';
+export * from './message.js';
+export * from './options/index.js';
+export * from './push-server.js';
+export * from './utils.js';

package/src/message.ts

@@ -1,105 +1,113 @@
-import Struct, { placeholder } from '@yume-chan/struct';
-
-export enum ScrcpyControlMessageType {
-    InjectKeycode,
-    InjectText,
-    InjectTouch,
-    InjectScroll,
-    BackOrScreenOn,
-    ExpandNotificationPanel,
-    CollapseNotificationPanel,
-    GetClipboard,
-    SetClipboard,
-    SetScreenPowerMode,
-    RotateDevice,
-}
-
-// https://developer.android.com/reference/android/view/MotionEvent#constants_1
-export enum AndroidMotionEventAction {
-    Down,
-    Up,
-    Move,
-    Cancel,
-    Outside,
-    PointerDown,
-    PointerUp,
-    HoverMove,
-    Scroll,
-    HoverEnter,
-    HoverExit,
-    ButtonPress,
-    ButtonRelease,
-}
-
-export const ScrcpyInjectTouchControlMessage =
-    new Struct()
-        .uint8('type', ScrcpyControlMessageType.InjectTouch as const)
-        .uint8('action', placeholder<AndroidMotionEventAction>())
-        .uint64('pointerId')
-        .uint32('pointerX')
-        .uint32('pointerY')
-        .uint16('screenWidth')
-        .uint16('screenHeight')
-        .uint16('pressure')
-        .uint32('buttons');
-
-export type ScrcpyInjectTouchControlMessage = typeof ScrcpyInjectTouchControlMessage['TInit'];
-
-export const ScrcpyInjectTextControlMessage =
-    new Struct()
-        .uint8('type', ScrcpyControlMessageType.InjectText as const)
-        .uint32('length')
-        .string('text', { lengthField: 'length' });
-
-export type ScrcpyInjectTextControlMessage =
-    typeof ScrcpyInjectTextControlMessage['TInit'];
-
-export enum AndroidKeyEventAction {
-    Down = 0,
-    Up = 1,
-}
-
-export enum AndroidKeyCode {
-    Home = 3,
-    Back = 4,
-    A = 29,
-    B,
-    C,
-    D,
-    E,
-    F,
-    G,
-    H,
-    I,
-    J,
-    K,
-    L,
-    M,
-    N,
-    O,
-    P,
-    Q,
-    R,
-    S,
-    T,
-    U,
-    V,
-    W,
-    X,
-    Y,
-    Z,
-    Space = 62,
-    Delete = 67,
-    AppSwitch = 187,
-}
-
-export const ScrcpyInjectKeyCodeControlMessage =
-    new Struct()
-        .uint8('type', ScrcpyControlMessageType.InjectKeycode as const)
-        .uint8('action', placeholder<AndroidKeyEventAction>())
-        .uint32('keyCode')
-        .uint32('repeat')
-        .uint32('metaState');
-
-export type ScrcpyInjectKeyCodeControlMessage =
-    typeof ScrcpyInjectKeyCodeControlMessage['TInit'];
+import Struct, { placeholder } from '@yume-chan/struct';
+
+// https://github.com/Genymobile/scrcpy/blob/fa5b2a29e983a46b49531def9cf3d80c40c3de37/app/src/control_msg.h#L23
+// For their message bodies, see https://github.com/Genymobile/scrcpy/blob/5c62f3419d252d10cd8c9cbb7c918b358b81f2d0/app/src/control_msg.c#L92
+export enum ScrcpyControlMessageType {
+    InjectKeycode,
+    InjectText,
+    InjectTouch,
+    InjectScroll,
+    BackOrScreenOn,
+    ExpandNotificationPanel,
+    ExpandSettingPanel,
+    CollapseNotificationPanel,
+    GetClipboard,
+    SetClipboard,
+    SetScreenPowerMode,
+    RotateDevice,
+}
+
+// https://developer.android.com/reference/android/view/MotionEvent#constants_1
+export enum AndroidMotionEventAction {
+    Down,
+    Up,
+    Move,
+    Cancel,
+    Outside,
+    PointerDown,
+    PointerUp,
+    HoverMove,
+    Scroll,
+    HoverEnter,
+    HoverExit,
+    ButtonPress,
+    ButtonRelease,
+}
+
+export const ScrcpySimpleControlMessage =
+    new Struct()
+        .uint8('type');
+
+export const ScrcpyInjectTouchControlMessage =
+    new Struct()
+        .fields(ScrcpySimpleControlMessage)
+        .uint8('action', placeholder<AndroidMotionEventAction>())
+        .uint64('pointerId')
+        .uint32('pointerX')
+        .uint32('pointerY')
+        .uint16('screenWidth')
+        .uint16('screenHeight')
+        .uint16('pressure')
+        .uint32('buttons');
+
+export type ScrcpyInjectTouchControlMessage = typeof ScrcpyInjectTouchControlMessage['TInit'];
+
+export const ScrcpyInjectTextControlMessage =
+    new Struct()
+        .fields(ScrcpySimpleControlMessage)
+        .uint32('length')
+        .string('text', { lengthField: 'length' });
+
+export type ScrcpyInjectTextControlMessage =
+    typeof ScrcpyInjectTextControlMessage['TInit'];
+
+export enum AndroidKeyEventAction {
+    Down = 0,
+    Up = 1,
+}
+
+export enum AndroidKeyCode {
+    Home = 3,
+    Back = 4,
+    A = 29,
+    B,
+    C,
+    D,
+    E,
+    F,
+    G,
+    H,
+    I,
+    J,
+    K,
+    L,
+    M,
+    N,
+    O,
+    P,
+    Q,
+    R,
+    S,
+    T,
+    U,
+    V,
+    W,
+    X,
+    Y,
+    Z,
+    Space = 62,
+    Enter = 66,
+    Delete = 67,
+    AppSwitch = 187,
+}
+
+export const ScrcpyInjectKeyCodeControlMessage =
+    new Struct()
+        .fields(ScrcpySimpleControlMessage)
+        .uint8('action', placeholder<AndroidKeyEventAction>())
+        .uint32('keyCode')
+        .uint32('repeat')
+        .uint32('metaState');
+
+export type ScrcpyInjectKeyCodeControlMessage =
+    typeof ScrcpyInjectKeyCodeControlMessage['TInit'];