Fix texture_id type

Author: jnschulze

dartvlc/internal/events.hpp

@@ -73,8 +73,9 @@ class PlayerEvents : public PlayerGetters {
     playlist_callback_ = callback;
   }
 
-  void OnVideo(std::function<void(uint8_t* frame, int32_t width,
-                                  int32_t height)> callback) {
+  void OnVideo(
+      std::function<void(uint8_t* frame, int32_t width, int32_t height)>
+          callback) {
     video_callback_ = callback;
   }
 
@@ -114,8 +115,8 @@ class PlayerEvents : public PlayerGetters {
     open_callback_(*vlc_media_ptr.get());
   }
 
-  std::function<void(int32_t, int32_t)> video_dimension_callback_ = [=](
-      int32_t, int32_t) -> void {};
+  std::function<void(int32_t, int32_t)> video_dimension_callback_ =
+      [=](int32_t, int32_t) -> void {};
 
   void OnVideoDimensionsCallback() {
     int32_t video_width = preferred_video_width_.has_value()
@@ -126,7 +127,7 @@ class PlayerEvents : public PlayerGetters {
             ? preferred_video_height_.value()
             : libvlc_video_get_height(vlc_media_player_.get());
     video_dimension_callback_(video_width, video_height);
-    if (video_width_ != video_width && video_height_ != video_height) {
+    if (video_width_ != video_width || video_height_ != video_height) {
       video_width_ = video_width;
       video_height_ = video_height;
       int32_t pitch = video_width * 4;
@@ -135,8 +136,9 @@ class PlayerEvents : public PlayerGetters {
       vlc_media_player_.setVideoCallbacks(
           std::bind(&PlayerEvents::OnVideoLockCallback, this,
                     std::placeholders::_1),
-          nullptr, std::bind(&PlayerEvents::OnVideoPictureCallback, this,
-                             std::placeholders::_1));
+          nullptr,
+          std::bind(&PlayerEvents::OnVideoPictureCallback, this,
+                    std::placeholders::_1));
       vlc_media_player_.setVideoFormatCallbacks(
           [=](char* chroma, uint32_t* w, uint32_t* h, uint32_t* p,
               uint32_t* l) -> int32_t {
@@ -188,8 +190,8 @@ class PlayerEvents : public PlayerGetters {
     stop_callback_();
   }
 
-  std::function<void(int32_t)> position_callback_ = [=](
-      int32_t position) -> void {};
+  std::function<void(int32_t)> position_callback_ =
+      [=](int32_t position) -> void {};
 
   void OnPositionCallback(float relative_position) {
     state()->is_playing_ = vlc_media_player_.isPlaying();
@@ -232,8 +234,8 @@ class PlayerEvents : public PlayerGetters {
 
   std::function<void(float)> rate_callback_ = [=](float) -> void {};
 
-  std::function<void(uint8_t*, int32_t, int32_t)> video_callback_ = [=](
-      uint8_t*, int32_t width, int32_t height) -> void {};
+  std::function<void(uint8_t*, int32_t, int32_t)> video_callback_ =
+      [=](uint8_t*, int32_t width, int32_t height) -> void {};
 
   void* OnVideoLockCallback(void** planes) {
     planes[0] = static_cast<void*>(video_frame_buffer_.get());

windows/video_outlet.hpp

@@ -1,13 +1,14 @@
-#include <mutex>
 #include <flutter/method_channel.h>
 #include <flutter/plugin_registrar_windows.h>
 #include <flutter/standard_method_codec.h>
 
+#include <mutex>
+
 class VideoOutlet {
  public:
   VideoOutlet(flutter::TextureRegistrar* texture_registrar);
 
-  int32_t texture_id() const { return texture_id_; }
+  int64_t texture_id() const { return texture_id_; }
 
   void OnVideo(uint8_t* buffer, int32_t width, int32_t height);
 
@@ -17,6 +18,6 @@ class VideoOutlet {
   FlutterDesktopPixelBuffer flutter_pixel_buffer_;
   flutter::TextureRegistrar* texture_registrar_ = nullptr;
   std::unique_ptr<flutter::TextureVariant> texture_ = nullptr;
-  int32_t texture_id_;
+  int64_t texture_id_;
   mutable std::mutex mutex_;
 };