add hw_device_ctx

kingslay · Dec 9, 2023 · 5c5f45b · 5c5f45b
1 parent f7af060
commit 5c5f45b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/FFmpegKit b/FFmpegKit
diff --git a/Sources/KSPlayer/MEPlayer/AVFFmpegExtension.swift b/Sources/KSPlayer/MEPlayer/AVFFmpegExtension.swift
@@ -28,20 +28,22 @@ extension UnsafeMutablePointer where Pointee == AVCodecContext {
                     if deviceCtx == nil {
                         break
                     }
-                    var framesCtx = av_hwframe_ctx_alloc(deviceCtx)
-                    if let framesCtx {
-                        let framesCtxData = UnsafeMutableRawPointer(framesCtx.pointee.data)
-                            .bindMemory(to: AVHWFramesContext.self, capacity: 1)
-                        framesCtxData.pointee.format = AV_PIX_FMT_VIDEOTOOLBOX
-                        framesCtxData.pointee.sw_format = ctx.pointee.pix_fmt.bestPixelFormat
-                        framesCtxData.pointee.width = ctx.pointee.width
-                        framesCtxData.pointee.height = ctx.pointee.height
-                    }
-                    if av_hwframe_ctx_init(framesCtx) != 0 {
-                        av_buffer_unref(&framesCtx)
-                        break
-                    }
-                    ctx.pointee.hw_frames_ctx = framesCtx
+                    // 只要有hw_device_ctx就可以了。不需要hw_frames_ctx
+                    ctx.pointee.hw_device_ctx = deviceCtx
+//                    var framesCtx = av_hwframe_ctx_alloc(deviceCtx)
+//                    if let framesCtx {
+//                        let framesCtxData = UnsafeMutableRawPointer(framesCtx.pointee.data)
+//                            .bindMemory(to: AVHWFramesContext.self, capacity: 1)
+//                        framesCtxData.pointee.format = AV_PIX_FMT_VIDEOTOOLBOX
+//                        framesCtxData.pointee.sw_format = ctx.pointee.pix_fmt.bestPixelFormat
+//                        framesCtxData.pointee.width = ctx.pointee.width
+//                        framesCtxData.pointee.height = ctx.pointee.height
+//                    }
+//                    if av_hwframe_ctx_init(framesCtx) != 0 {
+//                        av_buffer_unref(&framesCtx)
+//                        break
+//                    }
+//                    ctx.pointee.hw_frames_ctx = framesCtx
                     return fmt[i]
                 }
                 i += 1

diff --git a/Sources/KSPlayer/MEPlayer/Filter.swift b/Sources/KSPlayer/MEPlayer/Filter.swift
@@ -52,6 +52,13 @@ class MEFilter {
         guard ret >= 0 else { return false }
         ret = avfilter_link(bufferSrcContext, 0, inputs.pointee.filter_ctx, UInt32(inputs.pointee.pad_idx))
         guard ret >= 0 else { return false }
+        if let ctx = params.hw_frames_ctx {
+            let framesCtxData = UnsafeMutableRawPointer(ctx.pointee.data).bindMemory(to: AVHWFramesContext.self, capacity: 1)
+            inputs.pointee.filter_ctx.pointee.hw_device_ctx = framesCtxData.pointee.device_ref
+//                    outputs.pointee.filter_ctx.pointee.hw_device_ctx = framesCtxData.pointee.device_ref
+//                    bufferSrcContext?.pointee.hw_device_ctx = framesCtxData.pointee.device_ref
+//                    bufferSinkContext?.pointee.hw_device_ctx = framesCtxData.pointee.device_ref
+        }
         ret = avfilter_graph_config(graph, nil)
         guard ret >= 0 else { return false }
         return true
+4 −2		Demo/Demo.xcodeproj/project.pbxproj
+2 −2		Package.swift
+34 −20		Plugins/BuildFFmpeg/main.swift
+ −		Sources/Libmpv.xcframework/ios-arm64/Libmpv.framework/Libmpv
+ −		Sources/Libmpv.xcframework/ios-arm64_x86_64-maccatalyst/libmpv.framework/libmpv
+ −		Sources/Libmpv.xcframework/ios-arm64_x86_64-simulator/Libmpv.framework/Libmpv
+ −		Sources/Libmpv.xcframework/macos-arm64_x86_64/Libmpv.framework/Libmpv
+ −		Sources/Libmpv.xcframework/tvos-arm64_arm64e/libmpv.framework/libmpv
+ −		Sources/Libmpv.xcframework/tvos-arm64_x86_64-simulator/Libmpv.framework/Libmpv
+ −		Sources/Libmpv.xcframework/xros-arm64-simulator/libmpv.framework/libmpv
+ −		Sources/Libmpv.xcframework/xros-arm64/libmpv.framework/libmpv