From c37336cd9b05e783063c4d68f1a28f4daa487fb8 Mon Sep 17 00:00:00 2001 From: Kingtous Date: Tue, 28 Feb 2023 15:37:20 +0800 Subject: [PATCH] opt: try to fix the memory corrupt issue on Linux --- .vscode/launch.json | 33 ++++++++++++ CHANGELOG.md | 3 ++ example/pubspec.lock | 52 +++++++++--------- .../texture_rgba_renderer.h | 54 ++++++++++++------- linux/texture_rgba_renderer_plugin.cc | 29 ++++------ pubspec.yaml | 2 +- 6 files changed, 109 insertions(+), 64 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..57214d8 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,33 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "(gdb) 启动", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/example/build/linux/x64/debug/bundle/texture_rgba_renderer_example", + "args": [], + "stopAtEntry": false, + "cwd": "${fileDirname}", + "environment": [], + "externalConsole": false, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "为 gdb 启用整齐打印", + "text": "-enable-pretty-printing", + "ignoreFailures": true + }, + { + "description": "将反汇编风格设置为 Intel", + "text": "-gdb-set disassembly-flavor intel", + "ignoreFailures": true + } + ] + } + + ] +} \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 777106b..d6b1074 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +## 0.0.9 +* try fixing the memory corrupt issue on Linux. + ## 0.0.7 * add the FFI function and ptr getter for macOS. diff --git a/example/pubspec.lock b/example/pubspec.lock index b997cd3..777e3b2 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -6,7 +6,7 @@ packages: description: name: async sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.10.0" boolean_selector: @@ -14,7 +14,7 @@ packages: description: name: boolean_selector sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.1" characters: @@ -22,7 +22,7 @@ packages: description: name: characters sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.1" clock: @@ -30,7 +30,7 @@ packages: description: name: clock sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.1.1" collection: @@ -38,7 +38,7 @@ packages: description: name: collection sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.17.0" cupertino_icons: @@ -46,7 +46,7 @@ packages: description: name: cupertino_icons sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.0.5" fake_async: @@ -54,7 +54,7 @@ packages: description: name: fake_async sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.3.1" ffi: @@ -62,7 +62,7 @@ packages: description: name: ffi sha256: a38574032c5f1dd06c4aee541789906c12ccaab8ba01446e800d9c5b79c4a978 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.1" flutter: @@ -75,7 +75,7 @@ packages: description: name: flutter_lints sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.1" flutter_test: @@ -88,7 +88,7 @@ packages: description: name: js sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.6.5" lints: @@ -96,7 +96,7 @@ packages: description: name: lints sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.1" matcher: @@ -104,7 +104,7 @@ packages: description: name: matcher sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.12.13" material_color_utilities: @@ -112,7 +112,7 @@ packages: description: name: material_color_utilities sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.2.0" meta: @@ -120,7 +120,7 @@ packages: description: name: meta sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.8.0" path: @@ -128,17 +128,17 @@ packages: description: name: path sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.8.2" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a - url: "https://pub.flutter-io.cn" + sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc" + url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.4" sky_engine: dependency: transitive description: flutter @@ -149,7 +149,7 @@ packages: description: name: source_span sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.9.1" stack_trace: @@ -157,7 +157,7 @@ packages: description: name: stack_trace sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.11.0" stream_channel: @@ -165,7 +165,7 @@ packages: description: name: stream_channel sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.1" string_scanner: @@ -173,7 +173,7 @@ packages: description: name: string_scanner sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.0" term_glyph: @@ -181,7 +181,7 @@ packages: description: name: term_glyph sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: @@ -189,7 +189,7 @@ packages: description: name: test_api sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.4.16" texture_rgba_renderer: @@ -198,13 +198,13 @@ packages: path: ".." relative: true source: path - version: "0.0.7" + version: "0.0.9" vector_math: dependency: transitive description: name: vector_math sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.4" sdks: diff --git a/linux/include/texture_rgba_renderer/texture_rgba_renderer.h b/linux/include/texture_rgba_renderer/texture_rgba_renderer.h index e5f61b6..f1ac878 100644 --- a/linux/include/texture_rgba_renderer/texture_rgba_renderer.h +++ b/linux/include/texture_rgba_renderer/texture_rgba_renderer.h @@ -18,11 +18,11 @@ struct TextureRgbaPrivate { FlTextureRegistrar* texture_registrar = nullptr; GLuint texture_id = 0; - const uint8_t *buffer[2] = {nullptr, nullptr}; - size_t current_reading_index = 0; - bool buffer_ready = false; - int32_t video_width[2] = {0, 0}; - int32_t video_height[2] = {0, 0}; + const uint8_t *buffer = nullptr; + gboolean buffer_ready = FALSE; + gboolean terminated = FALSE; + gint32 video_width = 0; + gint32 video_height = 0; GMutex mutex; }; @@ -33,6 +33,24 @@ G_DEFINE_TYPE_WITH_CODE(TextureRgba, texture_rgba, fl_texture_gl_get_type(), G_ADD_PRIVATE(TextureRgba)) +static void texture_rgba_terminate(TextureRgba* texture) { + TextureRgbaPrivate *self = (TextureRgbaPrivate *) + texture_rgba_get_instance_private(TEXTURE_RGBA_RENDERER_TEXTURE_RGBA(texture)); + g_mutex_lock(&self->mutex); + g_atomic_int_set(&self->terminated, TRUE); + if (g_atomic_pointer_get(&self->buffer)) { + delete[] g_atomic_pointer_get(&self->buffer); + g_atomic_pointer_set(&self->buffer, nullptr); + } + g_mutex_unlock(&self->mutex); +} + +static gboolean texture_rgba_is_terminate(TextureRgba* texture) { + TextureRgbaPrivate *self = (TextureRgbaPrivate *) + texture_rgba_get_instance_private(TEXTURE_RGBA_RENDERER_TEXTURE_RGBA(texture)); + return g_atomic_int_get(&self->terminated); +} + static gboolean texture_rgba_populate(FlTextureGL *texture, uint32_t *target, uint32_t *name, @@ -44,16 +62,12 @@ static gboolean texture_rgba_populate(FlTextureGL *texture, texture_rgba_get_instance_private(TEXTURE_RGBA_RENDERER_TEXTURE_RGBA(texture)); g_mutex_lock(&self->mutex); - if (self->buffer_ready) { - self->current_reading_index ^= 1; - } - auto index = self->current_reading_index; - if (self->texture_id == 0) { glGenTextures(1, &self->texture_id); glBindTexture(GL_TEXTURE_2D, self->texture_id); // further configuration here. + g_atomic_pointer_set(&self->buffer, nullptr); } else { @@ -61,18 +75,20 @@ static gboolean texture_rgba_populate(FlTextureGL *texture, } // For example, we render pixel buffer here. // Note that Flutter only accepts textures in GL_RGBA8 format. - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, self->video_width[index], self->video_height[index], 0, GL_BGRA, - GL_UNSIGNED_BYTE, self->buffer[index]); - // Now we can release the self->buffer. - if (self->buffer[index] != nullptr) { - delete[] self->buffer[index]; - self->buffer[index] = nullptr; + if (g_atomic_pointer_get(&self->buffer)) { + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, g_atomic_int_get(&self->video_width), g_atomic_int_get(&self->video_height), 0, GL_BGRA, + GL_UNSIGNED_BYTE, g_atomic_pointer_get(&self->buffer)); } - self->buffer_ready = false; + // Now we can release the self->buffer. + if (g_atomic_pointer_get(&self->buffer) != nullptr) { + delete[] self->buffer; + g_atomic_pointer_set(&self->buffer, nullptr); + } + g_atomic_int_set(&self->buffer_ready, FALSE); *target = GL_TEXTURE_2D; *name = self->texture_id; - *width = self->video_width[index]; - *height = self->video_height[index]; + *width = g_atomic_int_get(&self->video_width); + *height = g_atomic_int_get(&self->video_height); g_mutex_unlock(&self->mutex); return TRUE; } diff --git a/linux/texture_rgba_renderer_plugin.cc b/linux/texture_rgba_renderer_plugin.cc index d5683cd..31ef73d 100644 --- a/linux/texture_rgba_renderer_plugin.cc +++ b/linux/texture_rgba_renderer_plugin.cc @@ -42,7 +42,7 @@ static void texture_rgba_renderer_plugin_handle_method_call( } else { - g_autoptr(TextureRgba) texture_rgba = texture_rgba_new(self->texture_registrar); + TextureRgba* texture_rgba = texture_rgba_new(self->texture_registrar); auto texture_id = reinterpret_cast(FL_TEXTURE(texture_rgba)); FL_TEXTURE_GL_GET_CLASS(texture_rgba)->populate = texture_rgba_populate; @@ -59,6 +59,7 @@ static void texture_rgba_renderer_plugin_handle_method_call( if (g_renderer_map.find(key) != g_renderer_map.end()) { fl_texture_registrar_unregister_texture(self->texture_registrar, FL_TEXTURE(g_renderer_map[key])); + texture_rgba_terminate(g_renderer_map[key]); g_renderer_map.erase(key); } response = FL_METHOD_RESPONSE(fl_method_success_response_new(fl_value_new_bool(true))); @@ -141,32 +142,24 @@ void texture_rgba_renderer_plugin_register_with_registrar(FlPluginRegistrar *reg extern "C" { void FlutterRgbaRendererPluginOnRgba(void *texture_rgba_ptr, const uint8_t *buffer, int width, int height) { - fprintf(stderr, "onRgba called\n"); TextureRgba* texture_rgba = TEXTURE_RGBA_RENDERER_TEXTURE_RGBA(texture_rgba_ptr); auto priv = (TextureRgbaPrivate *)texture_rgba_get_instance_private(texture_rgba); g_mutex_lock(&priv->mutex); // private has registered a texture_id, - if (priv->texture_id != 0) { + if (priv->texture_id != 0 && !g_atomic_int_get(&priv->buffer_ready) && !texture_rgba_is_terminate(texture_rgba)) { // copy data to the texture. auto buffer_length = 4 * width * height; auto copied_data = new uint8_t[buffer_length]; memcpy(copied_data, buffer, buffer_length); // It's safe to working on a non reading index - auto current_working_index = priv->current_reading_index ^ 1; - // Dropped frame, let's free this. - if (priv->buffer[current_working_index] != nullptr) { - delete[] priv->buffer[current_working_index]; - } - priv->buffer[current_working_index] = copied_data; - priv->video_height[current_working_index] = height; - priv->video_width[current_working_index] = width; - if (!priv->buffer_ready) { - priv->buffer_ready = true; - fl_texture_registrar_mark_texture_frame_available( - priv->texture_registrar, - FL_TEXTURE(texture_rgba) - ); - } + g_atomic_pointer_set(&priv->buffer, copied_data); + g_atomic_int_set(&priv->video_height, height); + g_atomic_int_set(&priv->video_width, width); + g_atomic_int_set(&priv->buffer_ready, TRUE); + fl_texture_registrar_mark_texture_frame_available( + priv->texture_registrar, + FL_TEXTURE(texture_rgba) + ); } g_mutex_unlock(&priv->mutex); } diff --git a/pubspec.yaml b/pubspec.yaml index 9a08074..27a35e2 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: texture_rgba_renderer description: A texture helper which brings a high level api to handle BGRA data. -version: 0.0.7 +version: 0.0.9 homepage: https://github.com/Kingtous/flutter_texture_rgba_renderer environment: