feat: add onRgba c api on windows

This commit is contained in:
Kingtous 2023-02-18 00:34:46 +08:00
parent 71e77ef3cf
commit 1a164ee5a0
9 changed files with 93 additions and 35 deletions

View file

@ -20,7 +20,7 @@
"/usr/include/libmount", "/usr/include/libmount",
"/usr/include/blkid", "/usr/include/blkid",
"/usr/include/pixman-1", "/usr/include/pixman-1",
"/usr/include/atk-1.0" "/usr/include/atk-1.0",
], ],
"defines": [], "defines": [],
"compilerPath": "/usr/bin/clang", "compilerPath": "/usr/bin/clang",

View file

@ -1,9 +1,13 @@
{ {
"files.associations": { "files.associations": {
"*.cjson": "jsonc",
"*.wxss": "css",
"*.wxs": "javascript",
"unordered_map": "cpp", "unordered_map": "cpp",
"compare": "cpp", "compare": "cpp",
"*.tcc": "cpp", "*.tcc": "cpp",
"functional": "cpp", "functional": "cpp",
"map": "cpp" "map": "cpp",
"memory": "cpp"
} }
} }

View file

@ -5,48 +5,47 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: async name: async
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.8.2" version: "2.10.0"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:
name: boolean_selector name: boolean_selector
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.0" version: "2.1.1"
characters: characters:
dependency: transitive dependency: transitive
description: description:
name: characters name: characters
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.2.0" version: "1.2.1"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.flutter-io.cn"
source: hosted
version: "1.3.1"
clock: clock:
dependency: transitive dependency: transitive
description: description:
name: clock name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.1.0" version: "1.1.1"
collection: collection:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.16.0" version: "1.17.0"
cupertino_icons: cupertino_icons:
dependency: "direct main" dependency: "direct main"
description: description:
name: cupertino_icons name: cupertino_icons
sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.0.5" version: "1.0.5"
@ -54,9 +53,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: fake_async name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.3.0" version: "1.3.1"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
@ -66,6 +66,7 @@ packages:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: flutter_lints name: flutter_lints
sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.1" version: "2.0.1"
@ -74,10 +75,19 @@ packages:
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
js:
dependency: transitive
description:
name: js
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
url: "https://pub.flutter-io.cn"
source: hosted
version: "0.6.5"
lints: lints:
dependency: transitive dependency: transitive
description: description:
name: lints name: lints
sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.0.1" version: "2.0.1"
@ -85,34 +95,39 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.12.11" version: "0.12.13"
material_color_utilities: material_color_utilities:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.1.4" version: "0.2.0"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.7.0" version: "1.8.0"
path: path:
dependency: transitive dependency: transitive
description: description:
name: path name: path
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.8.1" version: "1.8.2"
plugin_platform_interface: plugin_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: plugin_platform_interface name: plugin_platform_interface
sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.3" version: "2.1.3"
@ -125,58 +140,65 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: source_span name: source_span
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.8.2" version: "1.9.1"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
name: stack_trace name: stack_trace
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.10.0" version: "1.11.0"
stream_channel: stream_channel:
dependency: transitive dependency: transitive
description: description:
name: stream_channel name: stream_channel
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.0" version: "2.1.1"
string_scanner: string_scanner:
dependency: transitive dependency: transitive
description: description:
name: string_scanner name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.1.0" version: "1.2.0"
term_glyph: term_glyph:
dependency: transitive dependency: transitive
description: description:
name: term_glyph name: term_glyph
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "1.2.0" version: "1.2.1"
test_api: test_api:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "0.4.9" version: "0.4.16"
texture_rgba_renderer: texture_rgba_renderer:
dependency: "direct main" dependency: "direct main"
description: description:
path: ".." path: ".."
relative: true relative: true
source: path source: path
version: "0.0.3" version: "0.0.5"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
name: vector_math name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.flutter-io.cn" url: "https://pub.flutter-io.cn"
source: hosted source: hosted
version: "2.1.2" version: "2.1.4"
sdks: sdks:
dart: ">=2.17.0 <3.0.0" dart: ">=2.18.0 <3.0.0"
flutter: ">=2.5.0" flutter: ">=2.5.0"

View file

@ -16,6 +16,8 @@ extern "C" {
FLUTTER_PLUGIN_EXPORT void TextureRgbaRendererPluginCApiRegisterWithRegistrar( FLUTTER_PLUGIN_EXPORT void TextureRgbaRendererPluginCApiRegisterWithRegistrar(
FlutterDesktopPluginRegistrarRef registrar); FlutterDesktopPluginRegistrarRef registrar);
FLUTTER_PLUGIN_EXPORT void FlutterRgbaRendererPluginOnRgba(void* texture_rgba, const uint8_t* buffer, int width, int height);
#if defined(__cplusplus) #if defined(__cplusplus)
} // extern "C" } // extern "C"
#endif #endif

View file

@ -16,18 +16,27 @@ TextureRgba::~TextureRgba()
texture_registrar_->UnregisterTexture(texture_id_); texture_registrar_->UnregisterTexture(texture_id_);
} }
void TextureRgba::MarkVideoFrameAvailable(const std::vector<uint8_t>& buffer, size_t width, size_t height) void TextureRgba::MarkVideoFrameAvailable(
{ std::vector<uint8_t>& buffer, size_t width, size_t height) {
const std::lock_guard<std::mutex> lock(mutex_); const std::lock_guard<std::mutex> lock(mutex_);
// FIXME: remove copy. // FIXME: remove copy.
buffer_tmp_.resize(buffer.size()); std::swap(buffer, buffer_tmp_);
std::copy(buffer.begin(), buffer.end(), buffer_tmp_.begin());
flutter_pixel_buffer_.buffer = &buffer_tmp_[0]; flutter_pixel_buffer_.buffer = &buffer_tmp_[0];
flutter_pixel_buffer_.width = width; flutter_pixel_buffer_.width = width;
flutter_pixel_buffer_.height = height; flutter_pixel_buffer_.height = height;
texture_registrar_->MarkTextureFrameAvailable(texture_id_); texture_registrar_->MarkTextureFrameAvailable(texture_id_);
} }
void TextureRgba::MarkVideoFrameAvailablePtr(
const uint8_t* buffer, size_t width, size_t height) {
const std::lock_guard<std::mutex> lock(mutex_);
// FIXME: remove copy.
flutter_pixel_buffer_.buffer = buffer;
flutter_pixel_buffer_.width = width;
flutter_pixel_buffer_.height = height;
texture_registrar_->MarkTextureFrameAvailable(texture_id_);
}
inline const FlutterDesktopPixelBuffer* TextureRgba::buffer() inline const FlutterDesktopPixelBuffer* TextureRgba::buffer()
{ {
return &this->flutter_pixel_buffer_; return &this->flutter_pixel_buffer_;

View file

@ -8,7 +8,9 @@ public:
TextureRgba(flutter::TextureRegistrar* texture_registrar); TextureRgba(flutter::TextureRegistrar* texture_registrar);
~TextureRgba(); ~TextureRgba();
void MarkVideoFrameAvailable(const std::vector<uint8_t>& buffer, size_t width, size_t height); void MarkVideoFrameAvailable(std::vector<uint8_t>& buffer, size_t width, size_t height);
void MarkVideoFrameAvailablePtr(const uint8_t* buffer, size_t width, size_t height);
int64_t texture_id() const { return texture_id_; }; int64_t texture_id() const { return texture_id_; };

View file

@ -79,9 +79,22 @@ void TextureRgbaRendererPlugin::HandleMethodCall(
result->Success(flutter::EncodableValue(true)); result->Success(flutter::EncodableValue(true));
} }
} }
else if (method_call.method_name().compare("getTexturePtr") == 0) {
auto args = std::get<flutter::EncodableMap>(*method_call.arguments());
auto key = std::get<int>(args.at(flutter::EncodableValue("key")));
if (textures_.find(key) == textures_.end()) {
result->Success(flutter::EncodableValue(-1));
}
else {
// Return an address.
void* rgba = (void*) textures_[key].get();
result->Success(flutter::EncodableValue(rgba));
}
}
else { else {
result->NotImplemented(); result->NotImplemented();
} }
} }
} // namespace texture_rgba_renderer } // namespace texture_rgba_renderer

View file

@ -24,13 +24,13 @@ class TextureRgbaRendererPlugin : public flutter::Plugin {
TextureRgbaRendererPlugin& operator=(const TextureRgbaRendererPlugin&) = delete; TextureRgbaRendererPlugin& operator=(const TextureRgbaRendererPlugin&) = delete;
flutter::TextureRegistrar* texture_registrar; flutter::TextureRegistrar* texture_registrar;
std::unordered_map<int64_t, std::unique_ptr<TextureRgba>> textures_;
private: private:
// Called when a method is called on this plugin's channel from Dart. // Called when a method is called on this plugin's channel from Dart.
void HandleMethodCall( void HandleMethodCall(
const flutter::MethodCall<flutter::EncodableValue> &method_call, const flutter::MethodCall<flutter::EncodableValue> &method_call,
std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result); std::unique_ptr<flutter::MethodResult<flutter::EncodableValue>> result);
std::unordered_map<int64_t, std::unique_ptr<TextureRgba>> textures_;
}; };
} // namespace texture_rgba_renderer } // namespace texture_rgba_renderer

View file

@ -3,6 +3,7 @@
#include <flutter/plugin_registrar_windows.h> #include <flutter/plugin_registrar_windows.h>
#include "texture_rgba_renderer_plugin.h" #include "texture_rgba_renderer_plugin.h"
#include "texture_rgba.h"
void TextureRgbaRendererPluginCApiRegisterWithRegistrar( void TextureRgbaRendererPluginCApiRegisterWithRegistrar(
FlutterDesktopPluginRegistrarRef registrar) { FlutterDesktopPluginRegistrarRef registrar) {
@ -10,3 +11,8 @@ void TextureRgbaRendererPluginCApiRegisterWithRegistrar(
flutter::PluginRegistrarManager::GetInstance() flutter::PluginRegistrarManager::GetInstance()
->GetRegistrar<flutter::PluginRegistrarWindows>(registrar)); ->GetRegistrar<flutter::PluginRegistrarWindows>(registrar));
} }
void FlutterRgbaRendererPluginOnRgba(void* texture_rgba, const uint8_t* buffer, int width, int height) {
TextureRgba* rgba = static_cast<TextureRgba*>(texture_rgba);
rgba->MarkVideoFrameAvailablePtr(buffer, width, height);
}