misc, add dav1d

wang-bin · Mar 3, 2024 · 31b5ee6 · 31b5ee6
1 parent a751b05
commit 31b5ee6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,6 +26,10 @@ jobs:
         curl -kL -o R3DSDK_Redistributable.7z https://sourceforge.net/projects/mdk-sdk/files/deps/r3d/R3DSDK_Redistributable.7z/download
         cmake -E tar xvf R3DSDK_Redistributable.7z
         mv R3DSDK_Redistributable/mac/*.dylib SPV.app/Contents/Frameworks/
+        curl -kL -o dep.7z https://sourceforge.net/projects/mdk-sdk/files/deps/dep.7z/download
+        cmake -E tar xvf dep.7z
+        strip dep/lib/macOS/libdav1d.dylib
+        mv dep/lib/macOS/libdav1d.dylib SPV.app/Contents/Frameworks/
     - run: cmake -E tar cvf SPV.app.7z --format=7zip SPV.app
     - name: Upload
       uses: actions/upload-artifact@v4

diff --git a/QLView/PreviewViewController.swift b/QLView/PreviewViewController.swift
@@ -21,6 +21,7 @@ class PreviewViewController: NSViewController, QLPreviewingController {
         // Do any additional setup after loading the view.
 
         logLevel = .All
+        setGlobalOption(name: "MDK_KEY", value:"7047A5E361F780A4CDEC1BEEAE2A424E3C18A3B7D995DA354983ED25B9C17879C775D4ABE2D97201E20AC3A9C7F7FAA0EE005AF13E77E13D5027A1C0F828F60F77475A1C9E087F5B3213E41151D5BDB13C18B9D4B6F8F4582CE78444DDA40E12AE01FAF8B28F5C50AE5CAACCB02880C78F6EA2426E51C646078FFD87AE28F60F")
     }
 
     /*

diff --git a/SPV/AppDelegate.swift b/SPV/AppDelegate.swift
@@ -15,7 +15,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
     func applicationDidFinishLaunching(_ aNotification: Notification) {
 
         logLevel = .All
-
+        setGlobalOption(name: "MDK_KEY", value: "529809C623F1BF3CF6EA1185CE26D58FE00080C9352A743D65BA55968C1F3CAE16325E5B02B0CF466C474EA0E9305DF02A3D2EDA4CA0EFD2F03EA4D47011980CAD67F639DC0E40C30915EE7A31D92A70E00093AA5A475A5000DE3CF7E87A4AC57F46700852E6CD518320D3192631050388510E945A9E57E4931461ABED46980C")
         // Insert code here to initialize your application
         guard let win = NSApp.windows.first else {return}
         guard let vc = win.contentViewController else {

diff --git a/SPVBase/MTLVideoView.swift b/SPVBase/MTLVideoView.swift
@@ -75,7 +75,7 @@ class MTLVideoView: MTKView {
         }
 
         let scrW = NSScreen.main?.frame.width ?? 1920
-        player.videoDecoders = ["VT:copy=0", "VideoToolbox", "BRAW:gpu=auto:scale=\(scrW)", "R3D:scale=\(scrW)", "hap", "FFmpeg"]
+        player.videoDecoders = ["VT:copy=0", "VideoToolbox", "BRAW:gpu=auto:scale=\(scrW)", "R3D:scale=\(scrW)", "hap", "FFmpeg", "dav1d"]
 
         player.setTimeout(0, callback: { timeout in
             print("timeout detected \(timeout)!!!!")

diff --git a/SPVBase/ViewController.swift b/SPVBase/ViewController.swift
@@ -27,7 +27,6 @@ public class ViewController: NSViewController {
                 //OSLog(subsystem: Bundle.main.bundleIdentifier!, category: "media")
             }
         }
-        setGlobalOption(name: "MDK_KEY", value: "529809C623F1BF3CF6EA1185CE26D58FE00080C9352A743D65BA55968C1F3CAE16325E5B02B0CF466C474EA0E9305DF02A3D2EDA4CA0EFD2F03EA4D47011980CAD67F639DC0E40C30915EE7A31D92A70E00093AA5A475A5000DE3CF7E87A4AC57F46700852E6CD518320D3192631050388510E945A9E57E4931461ABED46980C")
         setGlobalOption(name: "plugins", value: "mdk-braw:mdk-r3d")
         setGlobalOption(name: "profiler.gpu", value: 1)
         return 0
-Original file line number
+Diff line change
@@ Expand Up @@
             // Do any additional setup after loading the view.
             logLevel = .All
+            setGlobalOption(name: "MDK_KEY", value:"7047A5E361F780A4CDEC1BEEAE2A424E3C18A3B7D995DA354983ED25B9C17879C775D4ABE2D97201E20AC3A9C7F7FAA0EE005AF13E77E13D5027A1C0F828F60F77475A1C9E087F5B3213E41151D5BDB13C18B9D4B6F8F4582CE78444DDA40E12AE01FAF8B28F5C50AE5CAACCB02880C78F6EA2426E51C646078FFD87AE28F60F")
         }
         /*
@@ Expand Down @@