fix(video/darwin): fix mpv_render_context_free call

birros · Sep 15, 2023 · 0b7c6b0 · 0b7c6b0
1 parent 8926ede
commit 0b7c6b0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/media_kit_video/common/darwin/Classes/plugin/TextureSW.swift b/media_kit_video/common/darwin/Classes/plugin/TextureSW.swift
@@ -69,6 +69,7 @@ public class TextureSW: NSObject, FlutterTexture, ResizableTextureProtocol {
   }
 
   private func disposeMPV() {
+    mpv_render_context_set_update_callback(renderContext, nil, nil)
     mpv_render_context_free(renderContext)
   }
 

diff --git a/media_kit_video/ios/Classes/plugin/TextureHW.swift b/media_kit_video/ios/Classes/plugin/TextureHW.swift
@@ -98,6 +98,13 @@ public class TextureHW: NSObject, FlutterTexture, ResizableTextureProtocol {
   }
 
   private func disposeMPV() {
+    CGLSetCurrentContext(context)
+    defer {
+      OpenGLHelpers.checkError("disposeMPV")
+      CGLSetCurrentContext(nil)
+    }
+
+    mpv_render_context_set_update_callback(renderContext, nil, nil)
     mpv_render_context_free(renderContext)
   }
 

diff --git a/media_kit_video/macos/Classes/plugin/TextureHW.swift b/media_kit_video/macos/Classes/plugin/TextureHW.swift
@@ -102,6 +102,13 @@ public class TextureHW: NSObject, FlutterTexture, ResizableTextureProtocol {
   }
 
   private func disposeMPV() {
+    CGLSetCurrentContext(context)
+    defer {
+      OpenGLHelpers.checkError("disposeMPV")
+      CGLSetCurrentContext(nil)
+    }
+
+    mpv_render_context_set_update_callback(renderContext, nil, nil)
     mpv_render_context_free(renderContext)
   }