Win bg fg buffer (#4)

* better frame available

Signed-off-by: fufesou <shuanglongchen@yeah.net>

* fix win, bg fg buffers

Signed-off-by: fufesou <shuanglongchen@yeah.net>

* swap -1

Signed-off-by: fufesou <shuanglongchen@yeah.net>

---------

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-02-21 09:03:18 +08:00 • committed by GitHub
parent 749acc2f87
commit 69a51033bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 41 additions and 23 deletions

View file

@ -1,6 +1,7 @@
#include "texture_rgba.h" #include "texture_rgba.h"
#include <iostream> #include <iostream>
TextureRgba::TextureRgba(flutter::TextureRegistrar *texture_registrar) TextureRgba::TextureRgba(flutter::TextureRegistrar *texture_registrar)
{ {
this->texture_registrar_ = texture_registrar; this->texture_registrar_ = texture_registrar;
@ -19,28 +20,35 @@ TextureRgba::~TextureRgba()
void TextureRgba::MarkVideoFrameAvailable( void TextureRgba::MarkVideoFrameAvailable(
std::vector<uint8_t> &buffer, size_t width, size_t height) std::vector<uint8_t> &buffer, size_t width, size_t height)
{ {
int bg_index = 0; if (buffer.empty() || buffer.size() != width * height * 4)
{ {
const std::lock_guard<std::mutex> lock(mutex_); return;
if (last_fg_index_ != fg_index_)
{
flutter_pixel_buffer_.buffer = static_cast<const uint8_t *>(buffer_tmp_[fg_index_].data());
flutter_pixel_buffer_.width = width_[fg_index_];
flutter_pixel_buffer_.height = height_[fg_index_];
last_fg_index_ = fg_index_;
texture_registrar_->MarkTextureFrameAvailable(texture_id_);
}
bg_index = fg_index_ ^ 1;
} }
const std::lock_guard<std::mutex> lock(mutex_);
int bg_index = fg_index_ ^ 1;
buffer.swap(buffer_tmp_[bg_index]); buffer.swap(buffer_tmp_[bg_index]);
width_[bg_index] = width; width_[bg_index] = width;
height_[bg_index] = height; height_[bg_index] = height;
if (!buff_ready_)
{
buff_ready_ = true;
texture_registrar_->MarkTextureFrameAvailable(texture_id_);
}
} }
// This function may be called
// event texture_registrar_->MarkTextureFrameAvailable(texture_id_); is not called before.
inline const FlutterDesktopPixelBuffer *TextureRgba::buffer() inline const FlutterDesktopPixelBuffer *TextureRgba::buffer()
{ {
const std::lock_guard<std::mutex> lock(mutex_); const std::lock_guard<std::mutex> lock(mutex_);
fg_index_ ^= 1; if (buff_ready_)
{
fg_index_ ^= 1;
flutter_pixel_buffer_.buffer = static_cast<const uint8_t *>(buffer_tmp_[fg_index_].data());
flutter_pixel_buffer_.width = width_[fg_index_];
flutter_pixel_buffer_.height = height_[fg_index_];
buff_ready_ = false;
}
return &this->flutter_pixel_buffer_; return &this->flutter_pixel_buffer_;
} }

View file

@ -22,13 +22,12 @@ private:
flutter::TextureRegistrar* texture_registrar_ = nullptr; flutter::TextureRegistrar* texture_registrar_ = nullptr;
std::unique_ptr<flutter::TextureVariant> texture_ = nullptr; std::unique_ptr<flutter::TextureVariant> texture_ = nullptr;
int64_t texture_id_; int64_t texture_id_;
mutable std::mutex mutex_; std::mutex mutex_;
int last_fg_index_ = 0;
int fg_index_ = 0; int fg_index_ = 0;
size_t width_[2] = {0, 0}; bool buff_ready_ = false;
size_t height_[2] = {0, 0}; size_t width_[2];
size_t height_[2];
std::vector<uint8_t> buffer_tmp_[2]; std::vector<uint8_t> buffer_tmp_[2];
Timer timer_;
}; };
#endif // TEXTURE_RGBA_H_ #endif // TEXTURE_RGBA_H_

View file

@ -1,3 +1,4 @@
#include <assert.h>
#include "include/texture_rgba_renderer/texture_rgba_renderer_plugin_c_api.h" #include "include/texture_rgba_renderer/texture_rgba_renderer_plugin_c_api.h"
#include <flutter/plugin_registrar_windows.h> #include <flutter/plugin_registrar_windows.h>
@ -6,14 +7,24 @@
#include "texture_rgba.h" #include "texture_rgba.h"
void TextureRgbaRendererPluginCApiRegisterWithRegistrar( void TextureRgbaRendererPluginCApiRegisterWithRegistrar(
FlutterDesktopPluginRegistrarRef registrar) { FlutterDesktopPluginRegistrarRef registrar)
texture_rgba_renderer::TextureRgbaRendererPlugin::RegisterWithRegistrar( {
flutter::PluginRegistrarManager::GetInstance() texture_rgba_renderer::TextureRgbaRendererPlugin::RegisterWithRegistrar(
->GetRegistrar<flutter::PluginRegistrarWindows>(registrar)); flutter::PluginRegistrarManager::GetInstance()
->GetRegistrar<flutter::PluginRegistrarWindows>(registrar));
} }
void FlutterRgbaRendererPluginOnRgba(void* texture_rgba, const uint8_t* buffer, int width, int height) { void FlutterRgbaRendererPluginOnRgba(void *texture_rgba, const uint8_t *buffer, int width, int height)
TextureRgba* rgba = static_cast<TextureRgba*>(texture_rgba); {
assert(texture_rgba != nullptr);
assert(buffer != nullptr);
assert(width > 0 && height > 0);
if (texture_rgba == nullptr || buffer == nullptr || width <= 0 || height <= 0)
{
return;
}
TextureRgba *rgba = static_cast<TextureRgba *>(texture_rgba);
std::vector<uint8_t> data(buffer, buffer + width * height * 4); std::vector<uint8_t> data(buffer, buffer + width * height * 4);
rgba->MarkVideoFrameAvailable(data, width, height); rgba->MarkVideoFrameAvailable(data, width, height);
} }