react-native-skia-webgpu-video 0.1.0-beta.4 → 0.1.0

package/patches/{react-native-skia+3.7.4.patch → react-native-skia+3.10.0.patch}

@@ -1,6 +1,6 @@
 --- a/node_modules/react-native-skia/cpp/rnskia/RNDawnContext.h
 +++ b/node_modules/react-native-skia/cpp/rnskia/RNDawnContext.h
-@@ -481,6 +481,40 @@
+@@ -492,6 +492,44 @@
      }
      current->context->submit(syncToCpu);
      return inserted;
@@ -17,6 +17,10 @@
 +      throw std::runtime_error(
 +          "Checked GPU submissions require a Graphite recorder");
 +    }
++    // As in submitRecording: the snap compiles the pipelines the recording
++    // needs, inline, GPU work the pipeline warmup stays behind (see
++    // RNSkGpuActivity), as is the run.
++    RNSkGpuActivity::Scope activity;
 +    auto recording = recorder->snap();
 +    if (recording == nullptr) {
 +      throw std::runtime_error("Cannot create checked Graphite recording");
@@ -118,7 +122,7 @@
  } // namespace RNSkia
 --- a/node_modules/react-native-skia/cpp/api/JsiSkApi.h
 +++ b/node_modules/react-native-skia/cpp/api/JsiSkApi.h
-@@ -159,6 +159,16 @@
+@@ -167,6 +167,16 @@
    }
    JSI_HOST_FUNCTION(Color) {
      return JsiSkColor::createCtor()(runtime, thisValue, arguments, count);
@@ -135,7 +139,7 @@
    }
    JSI_HOST_FUNCTION(getNativeDevice) {
      // Raw WGPUDevice pointer of the Graphite device, as a BigInt. Consumed by
-@@ -264,6 +274,8 @@
+@@ -267,6 +277,8 @@
    }
  
    static void definePrototype(jsi::Runtime &runtime, jsi::Object &prototype) {

package/scripts/skia-canvas-patch.json

@@ -1,13 +1,13 @@
 {
-  "version": "3.7.4",
+  "version": "3.10.0",
   "files": {
     "cpp/rnskia/RNDawnContext.h": {
-      "before": "7381d2c92b739deffa8429b72d66442b0a40655f3c66ce354bab81d2e058f874",
-      "after": "1846064f3db7eaca296a2f9c3c5fd45904300437cd79d1eeab771f63cf644e34",
+      "before": "ed26c1390ac4912089b354651c970801d42db7318ed40c51c19357b2252c52d4",
+      "after": "bceaaf3cabcde96d4d3843210d74e2de23991631e85427ec34c4b481ff30e5a0",
       "edits": [
         {
           "before": "    current->context->submit(syncToCpu);\n    return inserted;\n  }\n",
-          "after": "    current->context->submit(syncToCpu);\n    return inserted;\n  }\n\n  // Checked only for surfaces that explicitly opt into this contract: like\n  // submitRecording, but a recording that would not run throws instead of\n  // being dropped. A valid empty Recording is accepted; Recorder::snap()\n  // returns nullptr on failure.\n  void submitRecordingChecked(\n      skgpu::graphite::Recorder *recorder,\n      skgpu::graphite::SyncToCpu syncToCpu = skgpu::graphite::SyncToCpu::kNo) {\n    if (recorder == nullptr) {\n      throw std::runtime_error(\n          \"Checked GPU submissions require a Graphite recorder\");\n    }\n    auto recording = recorder->snap();\n    if (recording == nullptr) {\n      throw std::runtime_error(\"Cannot create checked Graphite recording\");\n    }\n    std::lock_guard<std::mutex> lock(_mutex);\n    auto *current = _current.load(std::memory_order_acquire);\n    if (generationOf(recorder) != current->id ||\n        current->lost.load(std::memory_order_acquire)) {\n      throw std::runtime_error(\n          \"The GPU device was lost; a checked recording cannot run\");\n    }\n    skgpu::graphite::InsertRecordingInfo info;\n    info.fRecording = recording.get();\n    auto status = current->context->insertRecording(info);\n    if (!static_cast<bool>(status)) {\n      throw std::runtime_error(\"Graphite rejected a checked recording: \" +\n                               status.message());\n    }\n    if (!current->context->submit(syncToCpu)) {\n      throw std::runtime_error(\"Graphite checked submission failed\");\n    }\n  }\n"
+          "after": "    current->context->submit(syncToCpu);\n    return inserted;\n  }\n\n  // Checked only for surfaces that explicitly opt into this contract: like\n  // submitRecording, but a recording that would not run throws instead of\n  // being dropped. A valid empty Recording is accepted; Recorder::snap()\n  // returns nullptr on failure.\n  void submitRecordingChecked(\n      skgpu::graphite::Recorder *recorder,\n      skgpu::graphite::SyncToCpu syncToCpu = skgpu::graphite::SyncToCpu::kNo) {\n    if (recorder == nullptr) {\n      throw std::runtime_error(\n          \"Checked GPU submissions require a Graphite recorder\");\n    }\n    // As in submitRecording: the snap compiles the pipelines the recording\n    // needs, inline, GPU work the pipeline warmup stays behind (see\n    // RNSkGpuActivity), as is the run.\n    RNSkGpuActivity::Scope activity;\n    auto recording = recorder->snap();\n    if (recording == nullptr) {\n      throw std::runtime_error(\"Cannot create checked Graphite recording\");\n    }\n    std::lock_guard<std::mutex> lock(_mutex);\n    auto *current = _current.load(std::memory_order_acquire);\n    if (generationOf(recorder) != current->id ||\n        current->lost.load(std::memory_order_acquire)) {\n      throw std::runtime_error(\n          \"The GPU device was lost; a checked recording cannot run\");\n    }\n    skgpu::graphite::InsertRecordingInfo info;\n    info.fRecording = recording.get();\n    auto status = current->context->insertRecording(info);\n    if (!static_cast<bool>(status)) {\n      throw std::runtime_error(\"Graphite rejected a checked recording: \" +\n                               status.message());\n    }\n    if (!current->context->submit(syncToCpu)) {\n      throw std::runtime_error(\"Graphite checked submission failed\");\n    }\n  }\n"
         }
       ]
     },
@@ -38,8 +38,8 @@
       ]
     },
     "cpp/api/JsiSkApi.h": {
-      "before": "72c8c6828c16ad9c764a749d5140f1a3536f83dd582dce65d6e7f42d88587a30",
-      "after": "9920a47ed26d4713b1f515f2acb54663ca47f44426d3110aed47f0193925ca49",
+      "before": "07846e9776f57bd2638e2e3092931e5a1324d66710693a2f7e550f648fe13934",
+      "after": "5c0bf4231d658366c8a902221238c3a244b6444cf407468f80c1cd1718b2be16",
       "edits": [
         {
           "before": "  JSI_HOST_FUNCTION(getNativeDevice) {\n",

package/src/exportFrames.ts

@@ -223,7 +223,7 @@ const importYuvExportFrame = (
         region!,
         target.texture,
       );
-    entry.image = Skia.Image.MakeImageFromGPUTexture(target.texture);
+    entry.image = Skia.Image.MakeFromGPUTexture(target.texture);
     if (!entry.image) throw new Error("Cannot wrap the decoded frame");
     return entry;
   } catch (error) {
@@ -290,7 +290,7 @@ export const importExportFrame = (
     entry.texture = entry.memory.createTexture();
     entry.memory.beginAccess(entry.texture, true);
     entry.accessing = true;
-    entry.image = Skia.Image.MakeImageFromGPUTexture(entry.texture);
+    entry.image = Skia.Image.MakeFromGPUTexture(entry.texture);
     if (!entry.image) throw new Error("Cannot wrap the decoded frame");
     return entry;
   } catch (error) {

package/src/exportVideoComposition.ts

@@ -11,7 +11,7 @@ import {
   type WorkletRuntime,
 } from "react-native-worklets";
 import { AlphaType, BlendMode, ColorType, Skia } from "react-native-skia";
-import type { ImageInfo, SkCanvas, SkSurface } from "react-native-skia";
+import type { SkCanvas, SkSurface } from "react-native-skia";
 import { Platform } from "react-native";
 import type {
   ExportOptions,
@@ -121,25 +121,11 @@ export type VideoExportArguments<T = undefined> = ExportOptions & {
   onProfile?: (profile: ExportProfile) => void;
 };
 
-// Native Skia 3.4.4 accepts destination/stride in readPixels; its
-// published Canvas type currently omits these arguments. Use only a private,
-// full-length, zero-offset Uint8Array (the native implementation ignores offsets).
-type ReadbackCanvas = {
-  readPixels: (
-    x: number,
-    y: number,
-    info: ImageInfo,
-    destination: Uint8Array,
-    bytesPerRow: number,
-  ) => Uint8Array | Float32Array | null;
-};
-
 type ExportState = {
   encoder: VideoEncoder | null;
   extractor: VideoCompositionFramesExtractorSync | null;
   surface: SkSurface | null;
   canvas: SkCanvas | null;
-  readback: Uint8Array | null;
   /** Draw into a lent encoder buffer instead of reading pixels back. */
   gpu: boolean;
   target: EncoderTarget | null;
@@ -401,7 +387,6 @@ const executeExport = <T>(args: VideoExportArguments<T>): Promise<void> =>
         }
         if (cleanup.safeToRelease) {
           state.frames = {};
-          state.readback = null;
           delete storage.__rnskwgpuExport;
         } else {
           // One retained session at most; subsequent exports fail before
@@ -463,6 +448,10 @@ const executeExport = <T>(args: VideoExportArguments<T>): Promise<void> =>
             await finish(null, true);
             return false;
           }
+          // CPU readback path only: the frame's pixels, still on their way.
+          const readback: {
+            pixels: ReturnType<SkCanvas["readPixels"]> | null;
+          } = { pixels: null };
           const draw = () => {
             "worklet";
             if (state.gpu)
@@ -517,46 +506,14 @@ const executeExport = <T>(args: VideoExportArguments<T>): Promise<void> =>
                   time,
                 );
               } else {
-                const readbackCanvas = canvas as unknown as ReadbackCanvas;
-                const pixels = readbackCanvas.readPixels(
-                  0,
-                  0,
-                  {
-                    width: options.width,
-                    height: options.height,
-                    colorType: bgra ? ColorType.BGRA_8888 : ColorType.RGBA_8888,
-                    alphaType: AlphaType.Premul,
-                  },
-                  state.readback!,
-                  options.width * 4,
-                );
-                if (
-                  !(pixels instanceof Uint8Array) ||
-                  pixels.byteLength !== bytes ||
-                  pixels.byteOffset !== 0 ||
-                  pixels.buffer !== state.readback!.buffer
-                ) {
-                  throw new Error("Video export pixel readback failed");
-                }
-                // Fallback: consumed synchronously by the bounded native pool.
-                const storage =
-                  pixels.byteOffset === 0 &&
-                  pixels.buffer.byteLength === pixels.byteLength
-                    ? pixels.buffer
-                    : pixels.buffer.slice(
-                        pixels.byteOffset,
-                        pixels.byteOffset + pixels.byteLength,
-                      );
-                state.encoder!.encodeFrame(
-                  {
-                    kind: bgra ? "bgra" : "rgba",
-                    data: storage,
-                    width: options.width,
-                    height: options.height,
-                    bytesPerRow: options.width * 4,
-                  },
-                  time,
-                );
+                // Skia 3.9 reads back asynchronously, into a new array: the
+                // frame is encoded once it lands, after this scope.
+                readback.pixels = canvas.readPixels(0, 0, {
+                  width: options.width,
+                  height: options.height,
+                  colorType: bgra ? ColorType.BGRA_8888 : ColorType.RGBA_8888,
+                  alphaType: AlphaType.Premul,
+                });
               }
               lap("encodeMs");
             } catch (error) {
@@ -593,6 +550,35 @@ const executeExport = <T>(args: VideoExportArguments<T>): Promise<void> =>
             if (drawn.failed) throw drawn.failure;
           };
           runWithVideoAutoreleasePool(draw);
+          if (readback.pixels) {
+            const pixels = await readback.pixels;
+            lap("gpuMs");
+            // isView, not instanceof: true of a typed array of any realm.
+            if (!ArrayBuffer.isView(pixels) || pixels.byteLength !== bytes)
+              throw new Error("Video export pixel readback failed");
+            // Fallback: consumed synchronously by the bounded native pool.
+            const storage =
+              pixels.byteOffset === 0 &&
+              pixels.buffer.byteLength === pixels.byteLength
+                ? pixels.buffer
+                : pixels.buffer.slice(
+                    pixels.byteOffset,
+                    pixels.byteOffset + pixels.byteLength,
+                  );
+            runWithVideoAutoreleasePool(() =>
+              state.encoder!.encodeFrame(
+                {
+                  kind: bgra ? "bgra" : "rgba",
+                  data: storage,
+                  width: options.width,
+                  height: options.height,
+                  bytesPerRow: options.width * 4,
+                },
+                time,
+              ),
+            );
+            lap("encodeMs");
+          }
           state.index++;
           if (onProgress)
             scheduleOnRN(onProgress, {
@@ -660,7 +646,6 @@ const executeExport = <T>(args: VideoExportArguments<T>): Promise<void> =>
           extractor: null,
           surface: null,
           canvas: null,
-          readback: null,
           gpu: false,
           target: null,
           window: null,
@@ -690,10 +675,9 @@ const executeExport = <T>(args: VideoExportArguments<T>): Promise<void> =>
                 state.reservations.push(
                   reserveVideoMemory(
                     bytes * 2,
-                    "export reusable readback and transient raster",
+                    "export readback and transient raster",
                   ),
                 );
-                state.readback = new Uint8Array(bytes);
                 state.hasRecorder = true;
                 state.surface = Skia.Surface.MakeOffscreen(
                   options.width,