Fix memory leak

xfangfang · Jan 22, 2025 · dc059a2 · dc059a2
1 parent 0ea8620
commit dc059a2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/scripts/psv/mpv_gxm/VITABUILD b/scripts/psv/mpv_gxm/VITABUILD
@@ -1,6 +1,6 @@
 pkgname=mpv
-pkgver=263756c30517a2b1329b1a96ad1a8d18160791f2
-pkgrel=4
+pkgver=11c16a2aa7d1e985b4d494da0a2ca19cc73bb5c4
+pkgrel=3
 url="https://mpv.io/"
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/xfangfang/mpv/archive/${pkgver}.tar.gz")
 sha256sums=('SKIP')

diff --git a/wiliwili/source/view/mpv_core.cpp b/wiliwili/source/view/mpv_core.cpp
@@ -445,25 +445,27 @@ void MPVCore::init() {
                                  {MPV_RENDER_PARAM_GXM_INIT_PARAMS, &gxm_params},
                                  {MPV_RENDER_PARAM_INVALID, nullptr}};
 
-    int texture_width     = DISPLAY_WIDTH;
-    int texture_height    = DISPLAY_HEIGHT;
-    int texture_stride    = ALIGN(texture_width, 8);
-    nvg_image             = nvgCreateImageRGBA(vg, texture_width, texture_height, 0, nullptr);
-    NVGXMtexture *texture = nvgxmImageHandle(vg, nvg_image);
-
-    NVGXMframebufferInitOptions framebufferOpts = {
-        .display_buffer_count = 1,  // Must be 1 for custom FBOs
-        .scenesPerFrame       = 1,
-        .render_target        = texture,
-        .color_format         = SCE_GXM_COLOR_FORMAT_U8U8U8U8_ABGR,
-        .color_surface_type   = SCE_GXM_COLOR_SURFACE_LINEAR,
-        .display_width        = texture_width,
-        .display_height       = texture_height,
-        .display_stride       = texture_stride,
-    };
-    mpv_fbo.tex = gxmCreateFramebuffer(&framebufferOpts);
-    mpv_fbo.w   = texture_width;
-    mpv_fbo.h   = texture_height;
+    if (mpv_fbo.tex == nullptr) {
+        int texture_width     = DISPLAY_WIDTH;
+        int texture_height    = DISPLAY_HEIGHT;
+        int texture_stride    = ALIGN(texture_width, 8);
+        nvg_image             = nvgCreateImageRGBA(vg, texture_width, texture_height, 0, nullptr);
+        NVGXMtexture *texture = nvgxmImageHandle(vg, nvg_image);
+
+        NVGXMframebufferInitOptions framebufferOpts = {
+            .display_buffer_count = 1,  // Must be 1 for custom FBOs
+            .scenesPerFrame       = 1,
+            .render_target        = texture,
+            .color_format         = SCE_GXM_COLOR_FORMAT_U8U8U8U8_ABGR,
+            .color_surface_type   = SCE_GXM_COLOR_SURFACE_LINEAR,
+            .display_width        = texture_width,
+            .display_height       = texture_height,
+            .display_stride       = texture_stride,
+        };
+        mpv_fbo.tex = gxmCreateFramebuffer(&framebufferOpts);
+        mpv_fbo.w   = texture_width;
+        mpv_fbo.h   = texture_height;
+    }
 #else
     int advanced_control{1};
     mpv_opengl_init_params gl_init_params{get_proc_address, nullptr};