Merge pull request media-kit#481 from birros/fix/mpv-context-free

fix(video): fix mpv_render_context_free call
birros · Sep 22, 2023 · 350e43a · 350e43a
2 parents 8926ede + 70d7777
commit 350e43a
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() {
+    EAGLContext.setCurrent(context)
+    defer {
+      OpenGLESHelpers.checkError("disposeMPV")
+      EAGLContext.setCurrent(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)
   }