diff --git a/example/macos/Podfile.lock b/example/macos/Podfile.lock index 14543af..150a074 100644 --- a/example/macos/Podfile.lock +++ b/example/macos/Podfile.lock @@ -14,7 +14,7 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/texture_rgba_renderer/macos SPEC CHECKSUMS: - FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 + FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424 texture_rgba_renderer: cbed959a3c127122194a364e14b8577bd62dc8f2 PODFILE CHECKSUM: 353c8bcc5d5b0994e508d035b5431cfe18c1dea7 diff --git a/example/pubspec.lock b/example/pubspec.lock index 3fce584..6d129aa 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,47 +5,48 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 url: "https://pub.flutter-io.cn" source: hosted - version: "2.10.0" + version: "2.8.2" 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" + version: "1.2.0" + charcode: + dependency: transitive + description: + name: charcode + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.3.1" clock: dependency: transitive description: name: clock - sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.1" + version: "1.1.0" collection: 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 +54,9 @@ packages: dependency: transitive description: name: fake_async - sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" url: "https://pub.flutter-io.cn" source: hosted - version: "1.3.1" + version: "1.3.0" 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,39 +85,34 @@ packages: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.13" + version: "0.12.11" 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.4" meta: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.0" + version: "1.7.0" path: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.2" + version: "1.8.1" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a url: "https://pub.flutter-io.cn" source: hosted version: "2.1.3" @@ -140,50 +125,44 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 url: "https://pub.flutter-io.cn" source: hosted - version: "1.9.1" + version: "1.8.2" 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.0" term_glyph: dependency: transitive description: name: term_glyph - sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.1" + version: "1.2.0" test_api: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 url: "https://pub.flutter-io.cn" source: hosted - version: "0.4.16" + version: "0.4.9" texture_rgba_renderer: dependency: "direct main" description: @@ -195,10 +174,9 @@ packages: 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.19.2 <3.0.0" + dart: ">=2.17.0 <3.0.0" flutter: ">=2.5.0" diff --git a/example/pubspec.yaml b/example/pubspec.yaml index afd00e9..50a5c61 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -5,7 +5,7 @@ description: Demonstrates how to use the texture_rgba_renderer plugin. publish_to: 'none' # Remove this line if you wish to publish to pub.dev environment: - sdk: '>=2.19.2 <3.0.0' + sdk: '>=2.17.0 <3.0.0' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/lib/texture_rgba_renderer_method_channel.dart b/lib/texture_rgba_renderer_method_channel.dart index 9a421ba..778d9b4 100644 --- a/lib/texture_rgba_renderer_method_channel.dart +++ b/lib/texture_rgba_renderer_method_channel.dart @@ -1,3 +1,5 @@ +import 'dart:typed_data'; + import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; diff --git a/lib/texture_rgba_renderer_platform_interface.dart b/lib/texture_rgba_renderer_platform_interface.dart index 96a085b..aae7772 100644 --- a/lib/texture_rgba_renderer_platform_interface.dart +++ b/lib/texture_rgba_renderer_platform_interface.dart @@ -1,3 +1,5 @@ +import 'dart:typed_data'; + import 'package:flutter/foundation.dart'; import 'package:plugin_platform_interface/plugin_platform_interface.dart'; diff --git a/macos/Classes/TextRgba.swift b/macos/Classes/TextRgba.swift index fdd15e7..61bc916 100644 --- a/macos/Classes/TextRgba.swift +++ b/macos/Classes/TextRgba.swift @@ -27,24 +27,24 @@ public final class TextRgba: NSObject, FlutterTexture { if (data == nil) { return nil } - return Unmanaged.passUnretained(data!) + return Unmanaged.passRetained(data!) } public func markFrameAvaliable(data: Data, width: Int, height: Int) -> Bool { self.data = data.withUnsafeBytes { buffer in - var pixelBufferCopy: CVPixelBuffer? = nil - CVPixelBufferCreate(kCFAllocatorDefault, width, height, kCVPixelFormatType_32RGBA, nil, &pixelBufferCopy) - if (pixelBufferCopy == nil) { + var pixelBufferCopy: CVPixelBuffer! + let result = CVPixelBufferCreate(kCFAllocatorDefault, width, height, kCVPixelFormatType_32BGRA, nil, &pixelBufferCopy) + guard result == kCVReturnSuccess else { return nil } - CVPixelBufferLockBaseAddress(pixelBufferCopy!, []) - defer {CVPixelBufferUnlockBaseAddress(pixelBufferCopy!, [])} + CVPixelBufferLockBaseAddress(pixelBufferCopy, []) + defer {CVPixelBufferUnlockBaseAddress(pixelBufferCopy, [])} var source = buffer.baseAddress! - for plane in 0 ..< CVPixelBufferGetPlaneCount(pixelBufferCopy!) { - let dest = CVPixelBufferGetBaseAddressOfPlane(pixelBufferCopy!, plane) - let height = CVPixelBufferGetHeightOfPlane(pixelBufferCopy!, plane) - let bytesPerRow = CVPixelBufferGetBytesPerRowOfPlane(pixelBufferCopy!, plane) + for plane in 0 ..< CVPixelBufferGetPlaneCount(pixelBufferCopy) { + let dest = CVPixelBufferGetBaseAddressOfPlane(pixelBufferCopy, plane) + let height = CVPixelBufferGetHeightOfPlane(pixelBufferCopy, plane) + let bytesPerRow = CVPixelBufferGetBytesPerRowOfPlane(pixelBufferCopy, plane) let planceSize = height * bytesPerRow memcpy(dest, source, planceSize) source += planceSize diff --git a/macos/Classes/TextureRgbaRendererPlugin.swift b/macos/Classes/TextureRgbaRendererPlugin.swift index 32fff55..148c8f3 100644 --- a/macos/Classes/TextureRgbaRendererPlugin.swift +++ b/macos/Classes/TextureRgbaRendererPlugin.swift @@ -35,7 +35,9 @@ public class TextureRgbaRendererPlugin: NSObject, FlutterPlugin { let args = call.arguments as! Dictionary let key = args["key"] as! Int64 if (renderer[key] != nil) { - texture_registry?.unregisterTexture(renderer[key]?.textureId ?? -1) + if (-1 != renderer[key]?.textureId) { + texture_registry?.unregisterTexture(renderer[key]?.textureId ?? -1) + } result(true) } else { result(false) @@ -44,14 +46,14 @@ public class TextureRgbaRendererPlugin: NSObject, FlutterPlugin { case "onRgba": let args = call.arguments as! Dictionary let key = args["key"] as! Int64 - let data = args["data"] as! Data + let data = args["data"] as! FlutterStandardTypedData let height = args["height"] as! Int let width = args["height"] as! Int let textureRgba = renderer[key] if (textureRgba == nil) { result(false) } else { - result(textureRgba!.markFrameAvaliable(data: data, width: width, height: height)) + result(textureRgba!.markFrameAvaliable(data: data.data, width: width, height: height)) } default: result(FlutterMethodNotImplemented) diff --git a/macos/texture_rgba_renderer.podspec b/macos/texture_rgba_renderer.podspec index 478a448..13fadda 100644 --- a/macos/texture_rgba_renderer.podspec +++ b/macos/texture_rgba_renderer.podspec @@ -17,7 +17,7 @@ A new Flutter plugin project. s.source_files = 'Classes/**/*' s.dependency 'FlutterMacOS' - s.platform = :osx, '10.11' + s.platform = :osx, '10.14' s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' } s.swift_version = '5.0' end diff --git a/pubspec.yaml b/pubspec.yaml index b48b02a..4000faf 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ version: 0.0.3 homepage: https://github.com/Kingtous/flutter_texture_rgba_renderer environment: - sdk: '>=2.15.0 <3.0.0' + sdk: '>=2.17.0 <3.0.0' flutter: ">=2.5.0" dependencies: