chore: Remove Skia ❌🎨 (#1740)

* Revert "feat: Skia for Android (#1731)" This reverts commit a7c137da07. * Remove some skia * Remove all the Skia stuff. * Update useFrameProcessor.ts * Update lockfiles * fix: Use native Preview again * Use `OpenGLTexture&` again * Remove `PreviewOutput` (we use `SurfaceView` in parallel) * fix: Log photo widths * fix: Fix cpplint
2023-09-01 12:20:17 +02:00
parent 22829083cd
commit 0a28454579
75 changed files with 404 additions and 2415 deletions
--- a/example/android/app/src/main/java/com/mrousavy/camera/example/ExampleFrameProcessorPlugin.java
+++ b/example/android/app/src/main/java/com/mrousavy/camera/example/ExampleFrameProcessorPlugin.java
@@ -17,8 +17,9 @@ public class ExampleFrameProcessorPlugin extends FrameProcessorPlugin {
    @Override
    public Object callback(@NotNull Frame frame, @Nullable Map<String, Object> params) {
        if (params == null) return null;
+        Image image = frame.getImage();

-        Log.d("ExamplePlugin", frame.getWidth() + " x " + frame.getHeight() + " Image with format #" + frame.getPixelFormat() + ". Logging " + params.size() + " parameters:");
+        Log.d("ExamplePlugin", image.getWidth() + " x " + image.getHeight() + " Image with format #" + image.getFormat() + ". Logging " + params.size() + " parameters:");

        for (String key : params.keySet()) {
            Object value = params.get(key);
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -41,4 +41,3 @@ hermesEnabled=true

 # Can be set to true to disable the build setup
 #VisionCamera_disableFrameProcessors=true
-#VisionCamera_disableSkia=true
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -333,10 +333,6 @@ PODS:
    - React-Core
  - react-native-safe-area-context (4.7.1):
    - React-Core
-  - react-native-skia (0.1.200):
-    - React
-    - React-callinvoker
-    - React-Core
  - react-native-video (5.2.1):
    - React-Core
    - react-native-video/Video (= 5.2.1)
@@ -505,11 +501,10 @@ PODS:
    - libwebp (~> 1.0)
    - SDWebImage/Core (~> 5.10)
  - SocketRocket (0.6.1)
-  - VisionCamera (3.0.0-rc.6):
+  - VisionCamera (3.0.0-rc.8):
    - React
    - React-callinvoker
    - React-Core
-    - react-native-skia
    - react-native-worklets-core
  - Yoga (1.14.0)

@@ -540,7 +535,6 @@ DEPENDENCIES:
  - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
  - "react-native-cameraroll (from `../node_modules/@react-native-camera-roll/camera-roll`)"
  - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
-  - "react-native-skia (from `../node_modules/@shopify/react-native-skia`)"
  - react-native-video (from `../node_modules/react-native-video`)
  - react-native-worklets-core (from `../node_modules/react-native-worklets-core`)
  - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`)
@@ -628,8 +622,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/@react-native-camera-roll/camera-roll"
  react-native-safe-area-context:
    :path: "../node_modules/react-native-safe-area-context"
-  react-native-skia:
-    :path: "../node_modules/@shopify/react-native-skia"
  react-native-video:
    :path: "../node_modules/react-native-video"
  react-native-worklets-core:
@@ -713,7 +705,6 @@ SPEC CHECKSUMS:
  react-native-blur: cfdad7b3c01d725ab62a8a729f42ea463998afa2
  react-native-cameraroll: 134805127580aed23403b8c2cb1548920dd77b3a
  react-native-safe-area-context: 9697629f7b2cda43cf52169bb7e0767d330648c2
-  react-native-skia: d0b0aab6bb1f146eb6f379fb671b719deabd20fb
  react-native-video: c26780b224543c62d5e1b2a7244a5cd1b50e8253
  react-native-worklets-core: 7ad416a8965086b98b07964f7f6932560a54a14c
  React-NativeModulesApple: c57f3efe0df288a6532b726ad2d0322a9bf38472
@@ -742,7 +733,7 @@ SPEC CHECKSUMS:
  SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
  SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
  SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
-  VisionCamera: 35a762f77816462a4d59a580ca197ffa29954112
+  VisionCamera: 5bd7961602a7db4de21fdc3588df6ce01d693d37
  Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce

 PODFILE CHECKSUM: ab9c06b18c63e741c04349c0fd630c6d3145081c
--- a/example/package.json
+++ b/example/package.json
@@ -18,7 +18,6 @@
    "@react-native-community/blur": "^4.3.2",
    "@react-navigation/native": "^6.1.7",
    "@react-navigation/native-stack": "^6.9.13",
-    "@shopify/react-native-skia": "^0.1.200",
    "react": "^18.2.0",
    "react-native": "^0.72.3",
    "react-native-fast-image": "^8.6.3",
--- a/example/src/CameraPage.tsx
+++ b/example/src/CameraPage.tsx
@@ -9,7 +9,6 @@ import {
  sortFormats,
  useCameraDevices,
  useFrameProcessor,
-  useSkiaFrameProcessor,
  VideoFile,
 } from 'react-native-vision-camera';
 import { Camera } from 'react-native-vision-camera';
@@ -25,7 +24,6 @@ import IonIcon from 'react-native-vector-icons/Ionicons';
 import type { Routes } from './Routes';
 import type { NativeStackScreenProps } from '@react-navigation/native-stack';
 import { useIsFocused } from '@react-navigation/core';
-import { Skia } from '@shopify/react-native-skia';
 import { FACE_SHADER } from './Shaders';
 import { examplePlugin } from './frame-processors/ExamplePlugin';

@@ -199,35 +197,11 @@ export function CameraPage({ navigation }: Props): React.ReactElement {
    console.log('re-rendering camera page without active camera');
  }

-  const radius = (format?.videoHeight ?? 1080) * 0.1;
-  const width = radius;
-  const height = radius;
-  const x = (format?.videoHeight ?? 1080) / 2 - radius / 2;
-  const y = (format?.videoWidth ?? 1920) / 2 - radius / 2;
-  const centerX = x + width / 2;
-  const centerY = y + height / 2;
-
-  const runtimeEffect = Skia.RuntimeEffect.Make(FACE_SHADER);
-  if (runtimeEffect == null) throw new Error('Shader failed to compile!');
-  const shaderBuilder = Skia.RuntimeShaderBuilder(runtimeEffect);
-  shaderBuilder.setUniform('r', [width]);
-  shaderBuilder.setUniform('x', [centerX]);
-  shaderBuilder.setUniform('y', [centerY]);
-  shaderBuilder.setUniform('resolution', [1920, 1080]);
-  const imageFilter = Skia.ImageFilter.MakeRuntimeShader(shaderBuilder, null, null);
-
-  const paint = Skia.Paint();
-  paint.setImageFilter(imageFilter);
-
-  const frameProcessor = useSkiaFrameProcessor((frame) => {
+  const frameProcessor = useFrameProcessor((frame) => {
    'worklet';

-    const rect = Skia.XYWHRect(150, 150, 300, 300);
-    const paint = Skia.Paint();
-    paint.setColor(Skia.Color('red'));
-    frame.drawRect(rect, paint);
-
    console.log(frame.timestamp, frame.toString(), frame.pixelFormat);
+    examplePlugin(frame);
  }, []);

  return (
--- a/example/yarn.lock
+++ b/example/yarn.lock
@@ -2319,14 +2319,6 @@
  dependencies:
    nanoid "^3.1.23"

-"@shopify/react-native-skia@^0.1.200":
-  version "0.1.200"
-  resolved "https://registry.yarnpkg.com/@shopify/react-native-skia/-/react-native-skia-0.1.200.tgz#3ef86750106a3b7e02496133173b449bfce6abc2"
-  integrity sha512-wAauKsLgScLspJY4KzoV0lWoXFCbzsUDJ3uso0o81HQMKBjDvXG9aOq/xE0KFLQsrQVICRdbfvvoYLQvSh/Xmw==
-  dependencies:
-    canvaskit-wasm "0.38.0"
-    react-reconciler "^0.27.0"
-
 "@sideway/address@^4.1.3":
  version "4.1.4"
  resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.4.tgz#03dccebc6ea47fdc226f7d3d1ad512955d4783f0"
@@ -3019,11 +3011,6 @@ caniuse-lite@^1.0.30001503:
  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001517.tgz#90fabae294215c3495807eb24fc809e11dc2f0a8"
  integrity sha512-Vdhm5S11DaFVLlyiKu4hiUTkpZu+y1KA/rZZqVQfOD5YdDT/eQKlkt7NaE0WGOFgX32diqt9MiP9CAiFeRklaA==

-canvaskit-wasm@0.38.0:
-  version "0.38.0"
-  resolved "https://registry.yarnpkg.com/canvaskit-wasm/-/canvaskit-wasm-0.38.0.tgz#83e6c46f3015c2ff3f6503157f47453af76a7be7"
-  integrity sha512-ZEG6lucpbQ4Ld+mY8C1Ng+PMLVP+/AX02jS0Sdl28NyMxuKSa9uKB8oGd1BYp1XWPyO2Jgr7U8pdyjJ/F3xR5Q==
-
 chalk@^2.0.0, chalk@^2.4.2:
  version "2.4.2"
  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
@@ -5857,14 +5844,6 @@ react-native@^0.72.3:
    ws "^6.2.2"
    yargs "^17.6.2"

-react-reconciler@^0.27.0:
-  version "0.27.0"
-  resolved "https://registry.yarnpkg.com/react-reconciler/-/react-reconciler-0.27.0.tgz#360124fdf2d76447c7491ee5f0e04503ed9acf5b"
-  integrity sha512-HmMDKciQjYmBRGuuhIaKA1ba/7a+UsM5FzOZsMO2JYHt9Jh8reCb7j1eDC95NOyUlKM9KRyvdx0flBuDvYSBoA==
-  dependencies:
-    loose-envify "^1.1.0"
-    scheduler "^0.21.0"
-
 react-refresh@^0.4.0:
  version "0.4.3"
  resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.3.tgz#966f1750c191672e76e16c2efa569150cc73ab53"
@@ -6115,13 +6094,6 @@ scheduler@0.24.0-canary-efb381bbf-20230505:
  dependencies:
    loose-envify "^1.1.0"

-scheduler@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.21.0.tgz#6fd2532ff5a6d877b6edb12f00d8ab7e8f308820"
-  integrity sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==
-  dependencies:
-    loose-envify "^1.1.0"
-
 semver@^5.6.0:
  version "5.7.1"
  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"