diff --git a/CHANGELOG.md b/CHANGELOG.md index 41cc7d8..b7adb01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ -## 0.0.1 +## 0.0.2 -* TODO: Describe initial release. +* Initial Hardware accelerated rgba render. diff --git a/README.md b/README.md index f0462ec..2808f33 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ A texture helper which brings a high level api to handle RGBA data. -![Pub Version](https://img.shields.io/pub/v/flutter_texture_rgba_renderer) +![Pub Version](https://img.shields.io/pub/v/texture_rgba_renderer) [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FKingtous%2Fflutter_texture_rgba_renderer.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2FKingtous%2Fflutter_texture_rgba_renderer?ref=badge_shield) ## Platform Support diff --git a/example/lib/main.dart b/example/lib/main.dart index a7dedab..1affee1 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'dart:async'; import 'package:flutter/services.dart'; -import 'package:flutter_texture_rgba_renderer/texture_rgba_renderer.dart'; +import 'package:texture_rgba_renderer/texture_rgba_renderer.dart'; void main() { runApp(const MyApp()); diff --git a/example/linux/flutter/generated_plugin_registrant.cc b/example/linux/flutter/generated_plugin_registrant.cc index cd64ea9..fa940dd 100644 --- a/example/linux/flutter/generated_plugin_registrant.cc +++ b/example/linux/flutter/generated_plugin_registrant.cc @@ -6,10 +6,10 @@ #include "generated_plugin_registrant.h" -#include +#include void fl_register_plugins(FlPluginRegistry* registry) { - g_autoptr(FlPluginRegistrar) flutter_texture_rgba_renderer_registrar = + g_autoptr(FlPluginRegistrar) texture_rgba_renderer_registrar = fl_plugin_registry_get_registrar_for_plugin(registry, "TextureRgbaRendererPlugin"); - texture_rgba_renderer_plugin_register_with_registrar(flutter_texture_rgba_renderer_registrar); + texture_rgba_renderer_plugin_register_with_registrar(texture_rgba_renderer_registrar); } diff --git a/example/linux/flutter/generated_plugins.cmake b/example/linux/flutter/generated_plugins.cmake index e1aa0ac..eba2d8c 100644 --- a/example/linux/flutter/generated_plugins.cmake +++ b/example/linux/flutter/generated_plugins.cmake @@ -3,7 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST - flutter_texture_rgba_renderer + texture_rgba_renderer ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/example/macos/Flutter/GeneratedPluginRegistrant.swift b/example/macos/Flutter/GeneratedPluginRegistrant.swift index 434d838..681d86b 100644 --- a/example/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/example/macos/Flutter/GeneratedPluginRegistrant.swift @@ -5,7 +5,7 @@ import FlutterMacOS import Foundation -import flutter_texture_rgba_renderer +import texture_rgba_renderer func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { TextureRgbaRendererPlugin.register(with: registry.registrar(forPlugin: "TextureRgbaRendererPlugin")) diff --git a/example/pubspec.lock b/example/pubspec.lock index d568c0b..24e13a0 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" flutter: @@ -67,7 +67,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: @@ -75,19 +75,12 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_texture_rgba_renderer: - dependency: "direct main" - description: - path: ".." - relative: true - source: path - version: "0.0.1" js: dependency: transitive description: name: js sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "0.6.5" lints: @@ -95,7 +88,7 @@ packages: description: name: lints sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.0.1" matcher: @@ -103,7 +96,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: @@ -111,7 +104,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: @@ -119,7 +112,7 @@ packages: description: name: meta sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "1.8.0" path: @@ -127,7 +120,7 @@ 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: @@ -135,7 +128,7 @@ packages: description: name: plugin_platform_interface sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a - url: "https://pub.flutter-io.cn" + url: "https://pub.dev" source: hosted version: "2.1.3" sky_engine: @@ -148,7 +141,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: @@ -156,7 +149,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: @@ -164,7 +157,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: @@ -172,7 +165,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: @@ -180,7 +173,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: @@ -188,15 +181,22 @@ 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: + dependency: "direct main" + description: + path: ".." + relative: true + source: path + version: "0.0.2" 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/example/pubspec.yaml b/example/pubspec.yaml index 5ed9eb9..afd00e9 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -17,7 +17,7 @@ dependencies: flutter: sdk: flutter - flutter_texture_rgba_renderer: + texture_rgba_renderer: # When depending on this package from a real application you should use: # flutter_texture_rgba_renderer: ^x.y.z # See https://dart.dev/tools/pub/dependencies#version-constraints diff --git a/example/windows/flutter/generated_plugin_registrant.cc b/example/windows/flutter/generated_plugin_registrant.cc index b7dbb9a..e346d3b 100644 --- a/example/windows/flutter/generated_plugin_registrant.cc +++ b/example/windows/flutter/generated_plugin_registrant.cc @@ -6,7 +6,7 @@ #include "generated_plugin_registrant.h" -#include +#include void RegisterPlugins(flutter::PluginRegistry* registry) { TextureRgbaRendererPluginCApiRegisterWithRegistrar( diff --git a/example/windows/flutter/generated_plugins.cmake b/example/windows/flutter/generated_plugins.cmake index 0954c0a..5e4d14a 100644 --- a/example/windows/flutter/generated_plugins.cmake +++ b/example/windows/flutter/generated_plugins.cmake @@ -3,7 +3,7 @@ # list(APPEND FLUTTER_PLUGIN_LIST - flutter_texture_rgba_renderer + texture_rgba_renderer ) list(APPEND FLUTTER_FFI_PLUGIN_LIST diff --git a/linux/include/texture_rgba_renderer/texture_rgba_renderer.h b/linux/include/texture_rgba_renderer/texture_rgba_renderer.h index 6e1d5e2..8d745a6 100644 --- a/linux/include/texture_rgba_renderer/texture_rgba_renderer.h +++ b/linux/include/texture_rgba_renderer/texture_rgba_renderer.h @@ -3,48 +3,70 @@ #include #include +#include #include "texture_rgba_renderer_plugin.h" -struct _TextureRgbaClass { - FlPixelBufferTextureClass parent_class; +struct _TextureRgbaClass +{ + FlTextureGLClass parent_class; }; struct TextureRgbaPrivate { - int64_t texture_id = 0; - uint8_t* buffer = nullptr; + GLuint texture_id = 0; + uint8_t *buffer = nullptr; int32_t video_width = 0; int32_t video_height = 0; }; /// Constructor. -G_DECLARE_DERIVABLE_TYPE(TextureRgba, texture_rgba, TEXTURE_RGBA_RENDERER, TEXTURE_RGBA, FlPixelBufferTexture) +G_DECLARE_DERIVABLE_TYPE(TextureRgba, texture_rgba, TEXTURE_RGBA_RENDERER, TEXTURE_RGBA, FlTextureGL) /// Add private data. G_DEFINE_TYPE_WITH_CODE(TextureRgba, texture_rgba, - fl_pixel_buffer_texture_get_type(), + fl_texture_gl_get_type(), G_ADD_PRIVATE(TextureRgba)) +static gboolean texture_rgba_populate(FlTextureGL *texture, + uint32_t *target, + uint32_t *name, + uint32_t *width, + uint32_t *height, + GError **error) +{ + TextureRgbaPrivate *self = (TextureRgbaPrivate *) + texture_rgba_get_instance_private(TEXTURE_RGBA_RENDERER_TEXTURE_RGBA(texture)); + if (self->texture_id == 0) + { + glGenTextures(1, &self->texture_id); + glBindTexture(GL_TEXTURE_2D, self->texture_id); + // further configuration here. + } + else + { + glBindTexture(GL_TEXTURE_2D, self->texture_id); + } + // 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, self->video_height, 0, GL_RGBA, + GL_UNSIGNED_BYTE, self->buffer); + + *target = GL_TEXTURE_2D; + *name = self->texture_id; + *width = self->video_width; + *height = self->video_height; -static gboolean texture_rgba_copy_pixels(FlPixelBufferTexture* texture, - const uint8_t** out_buffer, - uint32_t* width, uint32_t* height, - GError** error) { - auto texture_rgba_private = - (TextureRgbaPrivate*)texture_rgba_get_instance_private( - TEXTURE_RGBA_RENDERER_TEXTURE_RGBA(texture)); - *out_buffer = texture_rgba_private->buffer; - *width = texture_rgba_private->video_width; - *height = texture_rgba_private->video_height; return TRUE; } -static TextureRgba* texture_rgba_new() { +static TextureRgba *texture_rgba_new() +{ return TEXTURE_RGBA_RENDERER_TEXTURE_RGBA(g_object_new(texture_rgba_get_type(), nullptr)); } -static void texture_rgba_class_init(TextureRgbaClass* klass) { - FL_PIXEL_BUFFER_TEXTURE_CLASS(klass)->copy_pixels = texture_rgba_copy_pixels; +static void texture_rgba_class_init(TextureRgbaClass *klass) +{ + FL_TEXTURE_GL_GET_CLASS(klass)->populate = texture_rgba_populate; } static void texture_rgba_init(TextureRgba* self) {} diff --git a/linux/texture_rgba_renderer_plugin.cc b/linux/texture_rgba_renderer_plugin.cc index ac9a458..d694488 100644 --- a/linux/texture_rgba_renderer_plugin.cc +++ b/linux/texture_rgba_renderer_plugin.cc @@ -41,15 +41,14 @@ static void texture_rgba_renderer_plugin_handle_method_call( if (g_renderer_map.find(key) != g_renderer_map.end()) { response = FL_METHOD_RESPONSE(fl_method_success_response_new(fl_value_new_int(-1))); } else { - auto texture_rgba = texture_rgba_new(); - auto texture_rgba_private = (TextureRgbaPrivate*) texture_rgba_get_instance_private(texture_rgba); - texture_rgba_private->texture_id = reinterpret_cast(FL_TEXTURE(texture_rgba)); - FL_PIXEL_BUFFER_TEXTURE_GET_CLASS(texture_rgba)->copy_pixels = - texture_rgba_copy_pixels; + g_autoptr(TextureRgba) texture_rgba = texture_rgba_new(); + auto texture_id = reinterpret_cast(FL_TEXTURE(texture_rgba)); + FL_TEXTURE_GL_GET_CLASS(texture_rgba)->populate = + texture_rgba_populate; g_renderer_map[key] = texture_rgba; - // register to + // Register to the registrar. fl_texture_registrar_register_texture(self->texture_registrar, FL_TEXTURE(texture_rgba)); - response = FL_METHOD_RESPONSE(fl_method_success_response_new(fl_value_new_int(texture_rgba_private->texture_id))); + response = FL_METHOD_RESPONSE(fl_method_success_response_new(fl_value_new_int(texture_id))); } } else if (strcmp(method, "closeTexture") == 0) { auto args = fl_method_call_get_args(method_call); diff --git a/pubspec.yaml b/pubspec.yaml index 612bd95..135a7ea 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ -name: flutter_texture_rgba_renderer +name: texture_rgba_renderer description: A texture helper which brings a high level api to handle RGBA data. -version: 0.0.1 +version: 0.0.2 homepage: https://github.com/Kingtous/flutter_texture_rgba_renderer environment: diff --git a/test/texture_rgba_renderer_method_channel_test.dart b/test/texture_rgba_renderer_method_channel_test.dart index 50867db..9702f9a 100644 --- a/test/texture_rgba_renderer_method_channel_test.dart +++ b/test/texture_rgba_renderer_method_channel_test.dart @@ -1,6 +1,6 @@ import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:flutter_texture_rgba_renderer/texture_rgba_renderer_method_channel.dart'; +import 'package:texture_rgba_renderer/texture_rgba_renderer_method_channel.dart'; void main() { MethodChannelTextureRgbaRenderer platform =