fix: macos ptr access
This commit is contained in:
parent
6fd900c479
commit
4f059a9138
6 changed files with 72 additions and 56 deletions
|
|
@ -1,5 +1,7 @@
|
|||
import 'dart:ffi';
|
||||
import 'dart:math';
|
||||
import 'dart:typed_data';
|
||||
import 'package:ffi/ffi.dart';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'dart:async';
|
||||
|
|
@ -7,7 +9,28 @@ import 'dart:async';
|
|||
import 'package:flutter/services.dart';
|
||||
import 'package:texture_rgba_renderer/texture_rgba_renderer.dart';
|
||||
|
||||
typedef F1 = Void Function(
|
||||
Pointer<Void> ptr, Pointer<Uint8> buffer, Int32 width, Int32 height);
|
||||
typedef F1Dart = void Function(
|
||||
Pointer<Void> ptr, Pointer<Uint8> buffer, int width, int height);
|
||||
|
||||
class Native {
|
||||
Native._();
|
||||
|
||||
static get _instance => Native._()..init();
|
||||
static get instance => _instance;
|
||||
|
||||
late F1Dart onRgba;
|
||||
|
||||
init() {
|
||||
final lib = DynamicLibrary.process();
|
||||
onRgba = lib.lookupFunction<F1, F1Dart>("FlutterRgbaRendererPluginOnRgba");
|
||||
}
|
||||
}
|
||||
|
||||
void main() {
|
||||
// Load the native instance.
|
||||
final instance = Native.instance;
|
||||
runApp(const MyApp());
|
||||
}
|
||||
|
||||
|
|
@ -36,7 +59,7 @@ class _MyAppState extends State<MyApp> {
|
|||
if (textureId != -1) {
|
||||
debugPrint("Texture register success, textureId=$textureId");
|
||||
_textureRgbaRendererPlugin.getTexturePtr(key).then((value) {
|
||||
debugPrint("texture ptr: $value");
|
||||
debugPrint("texture ptr: ${value.toRadixString(16)}");
|
||||
setState(() {
|
||||
texturePtr = value;
|
||||
});
|
||||
|
|
@ -53,12 +76,18 @@ class _MyAppState extends State<MyApp> {
|
|||
void start() {
|
||||
debugPrint("start mockPic");
|
||||
Timer.periodic(const Duration(milliseconds: 30), (timer) async {
|
||||
data = mockPicture(width, height);
|
||||
final res =
|
||||
await _textureRgbaRendererPlugin.onRgba(key, data!, height, width);
|
||||
if (!res) {
|
||||
debugPrint("WARN: render failed");
|
||||
}
|
||||
// data = mockPicture(width, height);
|
||||
// Method.1: with MethodChannel
|
||||
// final res =
|
||||
// await _textureRgbaRendererPlugin.onRgba(key, data!, height, width);
|
||||
// if (!res) {
|
||||
// debugPrint("WARN: render failed");
|
||||
// }
|
||||
final dataPtr = mockPicturePtr(width, height);
|
||||
// Method.2: with native ffi
|
||||
Native.instance.onRgba(
|
||||
Pointer.fromAddress(texturePtr).cast<Void>(), dataPtr, width, height);
|
||||
malloc.free(dataPtr);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -77,6 +106,16 @@ class _MyAppState extends State<MyApp> {
|
|||
return Uint8List.fromList(pic);
|
||||
}
|
||||
|
||||
Pointer<Uint8> mockPicturePtr(int width, int height) {
|
||||
final pic = List.generate(width * height * 4, (index) {
|
||||
return random.nextInt(255);
|
||||
});
|
||||
final pic_addr = malloc.allocate(pic.length).cast<Uint8>();
|
||||
final list = pic_addr.asTypedList(pic.length);
|
||||
list.setRange(0, pic.length, pic);
|
||||
return pic_addr;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return MaterialApp(
|
||||
|
|
@ -99,7 +138,7 @@ class _MyAppState extends State<MyApp> {
|
|||
Align(
|
||||
alignment: Alignment.topLeft,
|
||||
child: Text(
|
||||
"texture id: $textureId, texture memory address: $texturePtr"),
|
||||
"texture id: $textureId, texture memory address: ${texturePtr.toRadixString(16)}"),
|
||||
),
|
||||
Align(
|
||||
alignment: Alignment.bottomCenter,
|
||||
|
|
|
|||
|
|
@ -5,23 +5,20 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: async
|
||||
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "2.10.0"
|
||||
version: "2.9.0"
|
||||
boolean_selector:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: boolean_selector
|
||||
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "2.1.1"
|
||||
version: "2.1.0"
|
||||
characters:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: characters
|
||||
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.2.1"
|
||||
|
|
@ -29,7 +26,6 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: clock
|
||||
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.1.1"
|
||||
|
|
@ -37,15 +33,13 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: collection
|
||||
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.17.0"
|
||||
version: "1.16.0"
|
||||
cupertino_icons:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: cupertino_icons
|
||||
sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.0.5"
|
||||
|
|
@ -53,10 +47,16 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: fake_async
|
||||
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.3.1"
|
||||
ffi:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
name: ffi
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "2.0.1"
|
||||
flutter:
|
||||
dependency: "direct main"
|
||||
description: flutter
|
||||
|
|
@ -66,7 +66,6 @@ packages:
|
|||
dependency: "direct dev"
|
||||
description:
|
||||
name: flutter_lints
|
||||
sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "2.0.1"
|
||||
|
|
@ -75,19 +74,10 @@ packages:
|
|||
description: flutter
|
||||
source: sdk
|
||||
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:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: lints
|
||||
sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "2.0.1"
|
||||
|
|
@ -95,23 +85,20 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: matcher
|
||||
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "0.12.13"
|
||||
version: "0.12.12"
|
||||
material_color_utilities:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: material_color_utilities
|
||||
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "0.2.0"
|
||||
version: "0.1.5"
|
||||
meta:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: meta
|
||||
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.8.0"
|
||||
|
|
@ -119,7 +106,6 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: path
|
||||
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.8.2"
|
||||
|
|
@ -127,7 +113,6 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: plugin_platform_interface
|
||||
sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "2.1.3"
|
||||
|
|
@ -140,39 +125,34 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: source_span
|
||||
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.9.1"
|
||||
version: "1.9.0"
|
||||
stack_trace:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: stack_trace
|
||||
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.11.0"
|
||||
version: "1.10.0"
|
||||
stream_channel:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: stream_channel
|
||||
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "2.1.1"
|
||||
version: "2.1.0"
|
||||
string_scanner:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: string_scanner
|
||||
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.2.0"
|
||||
version: "1.1.1"
|
||||
term_glyph:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: term_glyph
|
||||
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "1.2.1"
|
||||
|
|
@ -180,25 +160,23 @@ packages:
|
|||
dependency: transitive
|
||||
description:
|
||||
name: test_api
|
||||
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "0.4.16"
|
||||
version: "0.4.12"
|
||||
texture_rgba_renderer:
|
||||
dependency: "direct main"
|
||||
description:
|
||||
path: ".."
|
||||
relative: true
|
||||
source: path
|
||||
version: "0.0.5"
|
||||
version: "0.0.6"
|
||||
vector_math:
|
||||
dependency: transitive
|
||||
description:
|
||||
name: vector_math
|
||||
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
|
||||
url: "https://pub.flutter-io.cn"
|
||||
source: hosted
|
||||
version: "2.1.4"
|
||||
version: "2.1.2"
|
||||
sdks:
|
||||
dart: ">=2.18.0 <3.0.0"
|
||||
dart: ">=2.17.0 <3.0.0"
|
||||
flutter: ">=2.5.0"
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@ dependencies:
|
|||
# The following adds the Cupertino Icons font to your application.
|
||||
# Use with the CupertinoIcons class for iOS style icons.
|
||||
cupertino_icons: ^1.0.2
|
||||
ffi: ^2.0.1
|
||||
|
||||
dev_dependencies:
|
||||
flutter_test:
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ extern "C" {
|
|||
/// Keep the same name with Windows.
|
||||
void FlutterRgbaRendererPluginOnRgba(void* texture_rgba_ptr, const uint8_t* buffer, int width, int height) {
|
||||
TextRgba* texture_rgba = (__bridge TextRgba *)(texture_rgba_ptr);
|
||||
NSData* data = [NSData dataWithBytesNoCopy:(void*)buffer length:width * height * 4];
|
||||
NSData* data = [NSData dataWithBytesNoCopy:(void*)buffer length:width * height * 4 freeWhenDone:FALSE];
|
||||
[texture_rgba markFrameAvaliableWithData:data width:width height:height];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -62,10 +62,8 @@ public class TextureRgbaRendererPlugin: NSObject, FlutterPlugin {
|
|||
if (textureRgba == nil) {
|
||||
result(0)
|
||||
} else {
|
||||
let ptr = withUnsafePointer(to: textureRgba!) { p in
|
||||
return UnsafeRawPointer(p);
|
||||
};
|
||||
let intAddr = UInt(bitPattern: ptr)
|
||||
let unmanaged = Unmanaged.passUnretained(textureRgba!)
|
||||
let intAddr = UInt(bitPattern: unmanaged.toOpaque())
|
||||
result(intAddr)
|
||||
}
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ A new Flutter plugin project.
|
|||
s.source_files = 'Classes/**/*'
|
||||
s.dependency 'FlutterMacOS'
|
||||
|
||||
s.platform = :osx, '10.14'
|
||||
s.platform = :osx, '10.11'
|
||||
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
|
||||
s.swift_version = '5.0'
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue