react-native-skia 3.0.4 → 3.0.5

package/lib/typescript/src/skia/types/Surface/Surface.d.ts

@@ -12,17 +12,6 @@ export interface SkSurface extends SkJSIInstance<"Surface"> {
         example: https://fiddle.skia.org/c/@Surface_getCanvas
     */
     getCanvas(): SkCanvas;
-    /**
-     * Returns the backend texture of the surface.
-     * The returned object can be used to create a Skia Image object.
-     * The returned object is backend specific and should be used with caution.
-     * It is the caller's responsibility to ensure that the texture is not used after the surface is deleted
-     * or draw operations are performed on the surface.
-     * The returned object may be null if the surface does not have a backend texture.
-     *
-     * @return backend texture of the surface or null
-     */
-    getNativeTextureUnstable(): unknown;
     /** Returns Image capturing Surface contents. Subsequent drawing to
        Surface contents are not captured.
   
@@ -36,9 +25,9 @@ export interface SkSurface extends SkJSIInstance<"Surface"> {
     /**
      * Make sure any queued draws are sent to the screen or the GPU.
      * @param sync - When true, block until the GPU has finished executing the
-     * submitted work. Use this before reading the surface's texture from a native
-     * consumer on a different command queue (see {@link getNativeTextureUnstable}).
-     * Defaults to false.
+     * submitted work. Use this before a consumer on a different command queue
+     * reads the texture this surface draws into (see
+     * `Skia.Surface.MakeFromGPUTexture`). Defaults to false.
      */
     flush(sync?: boolean): void;
     /**

package/lib/typescript/src/skia/types/Surface/SurfaceFactory.d.ts

@@ -1,3 +1,4 @@
+import type { GPUTextureHandle } from "../GPUTexture";
 import type { SkSurface } from "./Surface";
 export declare const ColorSpace: {
     readonly SRGB: "srgb";
@@ -25,18 +26,18 @@ export interface SurfaceFactory {
     MakeOffscreen: (width: number, height: number, opts?: SurfaceOptions) => SkSurface | null;
     /**
      * Creates a GPU backed surface that draws directly into a WebGPU texture
-     * (zero-copy). The texture must be created on Skia's device
-     * (importDevice(Skia.getNativeDevice())) with RENDER_ATTACHMENT usage; add
-     * TEXTURE_BINDING to sample what Skia drew from WebGPU after each flush().
-     * The surface holds its own reference to the texture and keeps it alive
-     * for its lifetime, so the caller may release the GPUTexture once the
-     * surface exists. Calling destroy() on the GPUTexture still invalidates
-     * the surface.
+     * (zero-copy). The texture must be created with React Native WebGPU on
+     * the shared device (importDevice(Skia.getNativeDevice())) with the
+     * RENDER_ATTACHMENT usage; add TEXTURE_BINDING to sample what Skia drew
+     * from WebGPU after each flush(). The surface holds its own reference to
+     * the texture and keeps it alive for its lifetime, so the caller may
+     * release the GPUTexture once the surface exists. Calling destroy() on the
+     * GPUTexture still invalidates the surface.
      *
      * Native only.
      *
-     * @param pointer - The WGPUTexture pointer (texture.nativePointer)
+     * @param texture - The GPUTexture (see {@link GPUTextureHandle})
      * @returns An SkSurface rendering into the texture, or throws if the texture is invalid
      */
-    MakeFromNativeTexture: (pointer: bigint) => SkSurface;
+    MakeFromGPUTexture: (texture: GPUTextureHandle) => SkSurface;
 }

package/lib/typescript/src/skia/types/index.d.ts

@@ -29,8 +29,7 @@ export * from "./TextBlob";
 export * from "./Size";
 export * from "./Paragraph";
 export * from "./Matrix4";
-export * from "./NativeBuffer";
 export * from "./Recorder";
-export * from "./Video";
 export * from "./Skottie";
 export * from "./Graphite";
+export * from "./GPUTexture";

package/lib/typescript/src/skia/web/JsiSkImage.d.ts

@@ -13,5 +13,4 @@ export declare class JsiSkImage extends HostObject<Image, "Image"> implements Sk
     encodeToBase64(fmt?: ImageFormat, quality?: number): string;
     readPixels(srcX?: number, srcY?: number, imageInfo?: ImageInfo): Float32Array<ArrayBufferLike> | Uint8Array<ArrayBufferLike> | null;
     makeNonTextureImage(): SkImage;
-    getNativeTextureUnstable(): unknown;
 }

package/lib/typescript/src/skia/web/JsiSkImageFactory.d.ts

@@ -1,5 +1,5 @@
 import type { CanvasKit } from "canvaskit-wasm";
-import type { SkData, ImageInfo, SkImage, NativeBuffer, ImageFactory } from "../types";
+import type { SkData, ImageInfo, SkImage, ImageFactory, GPUTextureHandle } from "../types";
 import { Host } from "./Host";
 import { JsiSkImage } from "./JsiSkImage";
 import type { JsiSkSurface } from "./JsiSkSurface";
@@ -7,10 +7,9 @@ export declare class JsiSkImageFactory extends Host implements ImageFactory {
     constructor(CanvasKit: CanvasKit);
     MakeNull(): JsiSkImage;
     MakeImageFromViewTag(viewTag: number): Promise<SkImage | null>;
-    MakeImageFromNativeBuffer(buffer: NativeBuffer, surface?: JsiSkSurface, image?: JsiSkImage): JsiSkImage;
+    MakeImageFromNativeBuffer(buffer: CanvasImageSource, surface?: JsiSkSurface, image?: JsiSkImage): JsiSkImage;
     MakeImageFromEncoded(encoded: SkData): JsiSkImage | null;
-    MakeImageFromNativeTextureUnstable(): SkImage;
     MakeImage(info: ImageInfo, data: SkData, bytesPerRow: number): JsiSkImage | null;
-    MakeImageFromNativeTexture(_pointer: bigint): SkImage;
-    MakeNativeTextureFromImage(_image: SkImage): bigint;
+    MakeImageFromGPUTexture(_texture: GPUTextureHandle): SkImage;
+    MakeGPUTextureFromImage(_image: SkImage): bigint;
 }

package/lib/typescript/src/skia/web/JsiSkSurface.d.ts

@@ -10,5 +10,4 @@ export declare class JsiSkSurface extends HostObject<Surface, "Surface"> impleme
     height(): number;
     getCanvas(): SkCanvas;
     makeImageSnapshot(bounds?: SkRect, outputImage?: JsiSkImage): SkImage;
-    getNativeTextureUnstable(): unknown;
 }

package/lib/typescript/src/skia/web/JsiSkSurfaceFactory.d.ts

@@ -1,10 +1,10 @@
 import type { CanvasKit } from "canvaskit-wasm";
-import type { SkSurface, SurfaceFactory } from "../types";
+import type { GPUTextureHandle, SkSurface, SurfaceFactory } from "../types";
 import { Host } from "./Host";
 import { JsiSkSurface } from "./JsiSkSurface";
 export declare class JsiSkSurfaceFactory extends Host implements SurfaceFactory {
     constructor(CanvasKit: CanvasKit);
     Make(width: number, height: number): JsiSkSurface;
     MakeOffscreen(width: number, height: number): JsiSkSurface | null;
-    MakeFromNativeTexture(_pointer: bigint): SkSurface;
+    MakeFromGPUTexture(_texture: GPUTextureHandle): SkSurface;
 }

package/package.json

@@ -8,7 +8,7 @@
     "setup-skia-web": "scripts/setup-canvaskit.js"
   },
   "title": "React Native Skia",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "High-performance React Native Graphics using Skia",
   "main": "lib/module/index.js",
   "react-native": "src/index.ts",

package/src/external/reanimated/index.ts

@@ -3,4 +3,3 @@ export * from "./renderHelpers";
 export * from "./interpolators";
 export * from "./textures";
 export * from "./buffers";
-export * from "./useVideo";

package/src/mock/index.ts

@@ -67,6 +67,5 @@ export const Mock = (CanvasKit: CanvasKit) => {
     useTypeface: () => null,
     useImage: () => null,
     useSVG: () => null,
-    useVideo: () => null,
   };
 };

package/src/skia/types/GPUTexture.ts

@@ -0,0 +1,9 @@
+/**
+ * A WebGPU texture, as accepted by `Skia.Image.MakeImageFromGPUTexture` and
+ * `Skia.Surface.MakeFromGPUTexture`: a `GPUTexture` created with React Native
+ * WebGPU on the shared device, whose `nativePointer` (a non-spec extension)
+ * holds the `WGPUTexture` handle. The handle itself, as a `BigInt`, is
+ * accepted too for libraries that export textures without React Native
+ * WebGPU.
+ */
+export type GPUTextureHandle = { readonly nativePointer: bigint } | bigint;

package/src/skia/types/Image/Image.ts

@@ -62,17 +62,6 @@ export interface SkImage extends SkJSIInstance<"Image"> {
    */
   getImageInfo(): ImageInfo;
 
-  /**
-   * Returns the backend texture of the image.
-   * The returned object can be used to create a Skia Image object.
-   * The returned object is backend specific and should be used with caution.
-   * It is the caller's responsibility to ensure that the texture is not used after the image is deleted.
-   * The returned object may be null if the image does not have a backend texture.
-   *
-   * @return backend texture of the image or null
-   */
-  getNativeTextureUnstable(): unknown;
-
   /**
    * Returns this image as a shader with the specified tiling. It will use cubic sampling.
    * @param tx - tile mode in the x direction.

package/src/skia/types/Image/ImageFactory.ts

@@ -1,5 +1,5 @@
 import type { SkData } from "../Data";
-import type { NativeBuffer } from "../NativeBuffer";
+import type { GPUTextureHandle } from "../GPUTexture";
 
 import type { ColorType } from "./ColorType";
 import type { SkImage } from "./Image";
@@ -35,45 +35,17 @@ export interface ImageFactory {
   MakeImageFromEncoded: (encoded: SkData) => SkImage | null;
 
   /**
-   * Return an Image backed by a given native buffer.
-   * The native buffer must be a valid owning reference.
+   * Web only. Creates an image from a `CanvasImageSource`: an
+   * `HTMLVideoElement`, an `ImageBitmap`, a canvas, an `HTMLImageElement`...
    *
-   * For instance, this API is used by
-   * [react-native-vision-camera](https://github.com/mrousavy/react-native-vision-camera)
-   * to render a Skia Camera preview.
+   * On native platforms, camera and video frames are rendered into a texture
+   * of the shared device by React Native WebGPU
+   * (`queue.copyExternalImageToTexture()`), and the texture is wrapped with
+   * {@link MakeImageFromGPUTexture}. Calling this method there throws.
    *
-   * - On Android; This is an `AHardwareBuffer*`
-   * - On iOS, this is a `CVPixelBufferRef`
-   * @param nativeBuffer A strong `uintptr_t` pointer to the native buffer
-   * @throws Throws an error if the Image could not be created, for example when the given
-   * native buffer is invalid.
+   * @param source The image source
    */
-  MakeImageFromNativeBuffer: (nativeBuffer: NativeBuffer) => SkImage;
-
-  /**
-   *
-   * Return an Image backed by a given native texture.
-   *
-   * The native texture must be a valid owning reference.
-   *
-   * This API might be used to integrate with other libraries using gpu textures,
-   * or to transfer images between different threads.
-   *
-   * @param texture A native texture handle
-   * @param width The width of the texture
-   * @param height The height of the texture
-   * @param mipmapped Whether the texture is mipmapped
-   * @throws Throws an error if the Image could not be created, for example when the given native texture is invalid.
-   *
-   * @returns Returns a valid SkImage, if the texture is invalid, an error is thrown.
-   */
-  MakeImageFromNativeTextureUnstable: (
-    texture: unknown,
-    width: number,
-    height: number,
-    mipmapped?: boolean,
-    outputImage?: SkImage
-  ) => SkImage;
+  MakeImageFromNativeBuffer: (source: CanvasImageSource) => SkImage;
 
   /**
    * Returns an image that will be a screenshot of the view represented by
@@ -96,33 +68,31 @@ export interface ImageFactory {
   MakeImage(info: ImageInfo, data: SkData, bytesPerRow: number): SkImage | null;
 
   /**
-   * Creates an SkImage from a WebGPU texture.
-   * This allows using textures rendered by WebGPU in Skia drawings. The
-   * texture crosses the package boundary as a raw pointer: pass
-   * `texture.nativePointer` from a react-native-webgpu GPUTexture created on
-   * the shared device (importDevice(Skia.getNativeDevice())). The native side
-   * takes its own reference, so the handle stays valid even if the JS
-   * GPUTexture is garbage collected — but do not call texture.destroy()
-   * while the image is in use: destroy() releases the underlying GPU
-   * resource regardless of reference counts.
+   * Creates an SkImage from a WebGPU texture, without copying it.
+   * The texture must be created with React Native WebGPU on the shared
+   * device (importDevice(Skia.getNativeDevice())) with the TEXTURE_BINDING
+   * usage. The image takes its own reference to the texture, so it stays
+   * valid even if the JS GPUTexture is garbage collected; do not call
+   * texture.destroy() while the image is in use, as destroy() releases the
+   * GPU resource regardless of references.
    *
    * Native only.
    *
-   * @param pointer - The WGPUTexture pointer (texture.nativePointer)
-   * @returns An SkImage wrapping the texture, or throws if the texture is invalid
+   * @param texture - The GPUTexture (see {@link GPUTextureHandle})
+   * @returns An SkImage sampling the texture, or throws if the texture is invalid
    */
-  MakeImageFromNativeTexture(pointer: bigint): SkImage;
+  MakeImageFromGPUTexture(texture: GPUTextureHandle): SkImage;
 
   /**
-   * Creates a WebGPU texture from an SkImage.
-   * This allows using Skia images in WebGPU rendering pipelines. The
-   * returned pointer carries one reference and must be adopted exactly once
-   * with react-native-webgpu's adoptTexture(), which owns it from then on.
+   * Draws an SkImage into a new WebGPU texture on the shared device.
+   * The returned pointer carries one reference and must be adopted exactly
+   * once with React Native WebGPU's adoptTexture(), which builds the
+   * GPUTexture and owns the reference from then on.
    *
    * Native only.
    *
-   * @param image - An SkImage to convert to a texture
+   * @param image - The SkImage to draw into the texture
    * @returns A WGPUTexture pointer for adoptTexture(), or throws on failure
    */
-  MakeNativeTextureFromImage(image: SkImage): bigint;
+  MakeGPUTextureFromImage(image: SkImage): bigint;
 }

package/src/skia/types/Skia.ts

@@ -30,8 +30,6 @@ import type { Color, SkColor } from "./Color";
 import type { TypefaceFontProviderFactory } from "./Paragraph/TypefaceFontProviderFactory";
 import type { AnimatedImageFactory } from "./AnimatedImage";
 import type { ParagraphBuilderFactory } from "./Paragraph/ParagraphBuilder";
-import type { Video } from "./Video";
-import type { NativeBufferFactory } from "./NativeBuffer";
 import type { JsiRecorder } from "./Recorder";
 import type { SkottieFactory } from "./Skottie";
 
@@ -100,8 +98,6 @@ export interface Skia {
   Surface: SurfaceFactory;
   ParagraphBuilder: ParagraphBuilderFactory;
   Skottie: SkottieFactory;
-  Video: (url: string) => Promise<Video> | Video;
-  NativeBuffer: NativeBufferFactory;
   Recorder(): JsiRecorder;
   /**
    * Raw WGPUDevice pointer of Skia's Graphite device, as a BigInt. Pass it to

package/src/skia/types/Surface/Surface.ts

@@ -14,18 +14,6 @@ export interface SkSurface extends SkJSIInstance<"Surface"> {
   */
   getCanvas(): SkCanvas;
 
-  /**
-   * Returns the backend texture of the surface.
-   * The returned object can be used to create a Skia Image object.
-   * The returned object is backend specific and should be used with caution.
-   * It is the caller's responsibility to ensure that the texture is not used after the surface is deleted
-   * or draw operations are performed on the surface.
-   * The returned object may be null if the surface does not have a backend texture.
-   *
-   * @return backend texture of the surface or null
-   */
-  getNativeTextureUnstable(): unknown;
-
   /** Returns Image capturing Surface contents. Subsequent drawing to
      Surface contents are not captured.
 
@@ -40,9 +28,9 @@ export interface SkSurface extends SkJSIInstance<"Surface"> {
   /**
    * Make sure any queued draws are sent to the screen or the GPU.
    * @param sync - When true, block until the GPU has finished executing the
-   * submitted work. Use this before reading the surface's texture from a native
-   * consumer on a different command queue (see {@link getNativeTextureUnstable}).
-   * Defaults to false.
+   * submitted work. Use this before a consumer on a different command queue
+   * reads the texture this surface draws into (see
+   * `Skia.Surface.MakeFromGPUTexture`). Defaults to false.
    */
   flush(sync?: boolean): void;
 

package/src/skia/types/Surface/SurfaceFactory.ts

@@ -1,3 +1,5 @@
+import type { GPUTextureHandle } from "../GPUTexture";
+
 import type { SkSurface } from "./Surface";
 
 export const ColorSpace = {
@@ -35,18 +37,18 @@ export interface SurfaceFactory {
 
   /**
    * Creates a GPU backed surface that draws directly into a WebGPU texture
-   * (zero-copy). The texture must be created on Skia's device
-   * (importDevice(Skia.getNativeDevice())) with RENDER_ATTACHMENT usage; add
-   * TEXTURE_BINDING to sample what Skia drew from WebGPU after each flush().
-   * The surface holds its own reference to the texture and keeps it alive
-   * for its lifetime, so the caller may release the GPUTexture once the
-   * surface exists. Calling destroy() on the GPUTexture still invalidates
-   * the surface.
+   * (zero-copy). The texture must be created with React Native WebGPU on
+   * the shared device (importDevice(Skia.getNativeDevice())) with the
+   * RENDER_ATTACHMENT usage; add TEXTURE_BINDING to sample what Skia drew
+   * from WebGPU after each flush(). The surface holds its own reference to
+   * the texture and keeps it alive for its lifetime, so the caller may
+   * release the GPUTexture once the surface exists. Calling destroy() on the
+   * GPUTexture still invalidates the surface.
    *
    * Native only.
    *
-   * @param pointer - The WGPUTexture pointer (texture.nativePointer)
+   * @param texture - The GPUTexture (see {@link GPUTextureHandle})
    * @returns An SkSurface rendering into the texture, or throws if the texture is invalid
    */
-  MakeFromNativeTexture: (pointer: bigint) => SkSurface;
+  MakeFromGPUTexture: (texture: GPUTextureHandle) => SkSurface;
 }

package/src/skia/types/index.ts

@@ -29,8 +29,7 @@ export * from "./TextBlob";
 export * from "./Size";
 export * from "./Paragraph";
 export * from "./Matrix4";
-export * from "./NativeBuffer";
 export * from "./Recorder";
-export * from "./Video";
 export * from "./Skottie";
 export * from "./Graphite";
+export * from "./GPUTexture";

package/src/skia/web/JsiSkImage.ts

@@ -173,9 +173,4 @@ export class JsiSkImage extends HostObject<Image, "Image"> implements SkImage {
     }
     return new JsiSkImage(this.CanvasKit, img);
   }
-
-  getNativeTextureUnstable(): unknown {
-    console.warn("getBackendTexture is not implemented on Web");
-    return null;
-  }
 }

package/src/skia/web/JsiSkImageFactory.ts

@@ -1,19 +1,27 @@
 import type { CanvasKit, Image } from "canvaskit-wasm";
 
-import { CanvasKitWebGLBuffer, isNativeBufferWeb } from "../types";
 import type {
   SkData,
   ImageInfo,
   SkImage,
-  NativeBuffer,
   ImageFactory,
+  GPUTextureHandle,
 } from "../types";
 
 import { Host, getEnum, throwNotImplementedOnRNWeb } from "./Host";
 import { JsiSkImage } from "./JsiSkImage";
 import { JsiSkData } from "./JsiSkData";
 import type { JsiSkSurface } from "./JsiSkSurface";
-import type { CanvasKitWebGLBufferImpl } from "./CanvasKitWebGLBufferImpl";
+
+// The video element of a playing video, an ImageBitmap, a canvas...
+const isCanvasImageSource = (buffer: unknown): buffer is CanvasImageSource =>
+  buffer instanceof HTMLVideoElement ||
+  buffer instanceof HTMLCanvasElement ||
+  buffer instanceof ImageBitmap ||
+  buffer instanceof OffscreenCanvas ||
+  (typeof VideoFrame !== "undefined" && buffer instanceof VideoFrame) ||
+  buffer instanceof HTMLImageElement ||
+  buffer instanceof SVGImageElement;
 
 export class JsiSkImageFactory extends Host implements ImageFactory {
   constructor(CanvasKit: CanvasKit) {
@@ -32,12 +40,12 @@ export class JsiSkImageFactory extends Host implements ImageFactory {
   }
 
   MakeImageFromNativeBuffer(
-    buffer: NativeBuffer,
+    buffer: CanvasImageSource,
     surface?: JsiSkSurface,
     image?: JsiSkImage
   ) {
-    if (!isNativeBufferWeb(buffer)) {
-      throw new Error("Invalid NativeBuffer");
+    if (!isCanvasImageSource(buffer)) {
+      throw new Error("MakeImageFromNativeBuffer expects a CanvasImageSource");
     }
     if (!surface) {
       let img: Image;
@@ -47,10 +55,6 @@ export class JsiSkImageFactory extends Host implements ImageFactory {
         buffer instanceof ImageBitmap
       ) {
         img = this.CanvasKit.MakeLazyImageFromTextureSource(buffer);
-      } else if (buffer instanceof CanvasKitWebGLBuffer) {
-        img = (
-          buffer as CanvasKitWebGLBuffer as CanvasKitWebGLBufferImpl
-        ).toImage();
       } else {
         img = this.CanvasKit.MakeImageFromCanvasImageSource(buffer);
       }
@@ -79,10 +83,6 @@ export class JsiSkImageFactory extends Host implements ImageFactory {
     return new JsiSkImage(this.CanvasKit, image);
   }
 
-  MakeImageFromNativeTextureUnstable() {
-    return throwNotImplementedOnRNWeb<SkImage>();
-  }
-
   MakeImage(info: ImageInfo, data: SkData, bytesPerRow: number) {
     // see toSkImageInfo() from canvaskit
     const image = this.CanvasKit.MakeImage(
@@ -102,11 +102,11 @@ export class JsiSkImageFactory extends Host implements ImageFactory {
     return new JsiSkImage(this.CanvasKit, image);
   }
 
-  MakeImageFromNativeTexture(_pointer: bigint): SkImage {
+  MakeImageFromGPUTexture(_texture: GPUTextureHandle): SkImage {
     return throwNotImplementedOnRNWeb<SkImage>();
   }
 
-  MakeNativeTextureFromImage(_image: SkImage): bigint {
+  MakeGPUTextureFromImage(_image: SkImage): bigint {
     return throwNotImplementedOnRNWeb<bigint>();
   }
 }

package/src/skia/web/JsiSkSurface.ts

@@ -47,9 +47,4 @@ export class JsiSkSurface
     }
     return new JsiSkImage(this.CanvasKit, image);
   }
-
-  getNativeTextureUnstable(): unknown {
-    console.warn("getBackendTexture is not implemented on Web");
-    return null;
-  }
 }

package/src/skia/web/JsiSkSurfaceFactory.ts

@@ -1,6 +1,6 @@
 import type { CanvasKit, Surface } from "canvaskit-wasm";
 
-import type { SkSurface, SurfaceFactory } from "../types";
+import type { GPUTextureHandle, SkSurface, SurfaceFactory } from "../types";
 
 import { Host, throwNotImplementedOnRNWeb } from "./Host";
 import { JsiSkSurface } from "./JsiSkSurface";
@@ -39,7 +39,7 @@ export class JsiSkSurfaceFactory extends Host implements SurfaceFactory {
     return new JsiSkSurface(this.CanvasKit, surface);
   }
 
-  MakeFromNativeTexture(_pointer: bigint): SkSurface {
+  MakeFromGPUTexture(_texture: GPUTextureHandle): SkSurface {
     return throwNotImplementedOnRNWeb<SkSurface>();
   }
 }

package/src/skia/web/JsiSkia.ts

@@ -43,8 +43,6 @@ import { JsiSkTypefaceFontProviderFactory } from "./JsiSkTypefaceFontProviderFac
 import { JsiSkFontMgrFactory } from "./JsiSkFontMgrFactory";
 import { JsiSkAnimatedImageFactory } from "./JsiSkAnimatedImageFactory";
 import { JsiSkParagraphBuilderFactory } from "./JsiSkParagraphBuilderFactory";
-import { JsiSkNativeBufferFactory } from "./JsiSkNativeBufferFactory";
-import { createVideo } from "./JsiVideo";
 import { throwNotImplementedOnRNWeb } from "./Host";
 import { JsiSkottieFactory } from "./JsiSkottieFactory";
 
@@ -133,9 +131,7 @@ export const JsiSkApi = (CanvasKit: CanvasKit): Skia => ({
   TypefaceFontProvider: new JsiSkTypefaceFontProviderFactory(CanvasKit),
   FontMgr: new JsiSkFontMgrFactory(CanvasKit),
   ParagraphBuilder: new JsiSkParagraphBuilderFactory(CanvasKit),
-  NativeBuffer: new JsiSkNativeBufferFactory(CanvasKit),
   Skottie: new JsiSkottieFactory(CanvasKit),
-  Video: createVideo.bind(null, CanvasKit),
   Recorder: () => {
     return throwNotImplementedOnRNWeb<JsiRecorder>();
   },

package/android/cpp/rnskia-android/AHardwareBufferUtils.cpp

@@ -1,31 +0,0 @@
-#if __ANDROID_API__ >= 26
-
-#include "AHardwareBufferUtils.h"
-#include <android/hardware_buffer.h>
-
-namespace RNSkia {
-
-uint32_t GetBufferFormatFromSkColorType(SkColorType bufferFormat) {
-  switch (bufferFormat) {
-  case kRGBA_8888_SkColorType:
-    return AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;
-  case kRGB_888x_SkColorType:
-    return AHARDWAREBUFFER_FORMAT_R8G8B8X8_UNORM;
-  case kRGBA_F16_SkColorType:
-    return AHARDWAREBUFFER_FORMAT_R16G16B16A16_FLOAT;
-  case kRGB_565_SkColorType:
-    return AHARDWAREBUFFER_FORMAT_R5G6B5_UNORM;
-  case kRGBA_1010102_SkColorType:
-    return AHARDWAREBUFFER_FORMAT_R10G10B10A2_UNORM;
-#if __ANDROID_API__ >= 33
-  case kAlpha_8_SkColorType:
-    return AHARDWAREBUFFER_FORMAT_R8_UNORM;
-#endif
-  default:
-    return AHARDWAREBUFFER_FORMAT_R8G8B8A8_UNORM;
-  }
-}
-
-} // namespace RNSkia
-
-#endif

package/android/cpp/rnskia-android/AHardwareBufferUtils.h

@@ -1,13 +0,0 @@
-#pragma once
-
-#include "include/core/SkColorType.h"
-
-#if __ANDROID_API__ >= 26
-
-namespace RNSkia {
-
-uint32_t GetBufferFormatFromSkColorType(SkColorType bufferFormat);
-
-} // namespace RNSkia
-
-#endif