fix win crash (#3)

* fix win crash

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

* better lock guard

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

---------

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2023-02-20 23:16:44 +08:00 • committed by GitHub
parent 1306df8554
commit 749acc2f87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 51 deletions

View file

@ -6,11 +6,7 @@ TextureRgba::TextureRgba(flutter::TextureRegistrar *texture_registrar)
this->texture_registrar_ = texture_registrar;
// TODO: flutter only support PixelBuffer in 2023.02.17.
auto buffer = flutter::PixelBufferTexture([=](size_t width, size_t height) -> const FlutterDesktopPixelBuffer *
{
std::cout << " GL. C++ rendering interval " << timer_.elapsed() << " ms" << std::endl;
timer_.reset();
const std::lock_guard<std::mutex> lock(mutex_);
return this->buffer(); });
{ return this->buffer(); });
texture_ = std::make_unique<flutter::TextureVariant>(buffer);
this->texture_id_ = texture_registrar->RegisterTexture(texture_.get());
}
@ -23,16 +19,28 @@ TextureRgba::~TextureRgba()
void TextureRgba::MarkVideoFrameAvailable(
std::vector<uint8_t> &buffer, size_t width, size_t height)
{
const std::lock_guard<std::mutex> lock(mutex_);
// FIXME: remove copy.
std::swap(buffer, buffer_tmp_);
flutter_pixel_buffer_.buffer = &buffer_tmp_[0];
flutter_pixel_buffer_.width = width;
flutter_pixel_buffer_.height = height;
texture_registrar_->MarkTextureFrameAvailable(texture_id_);
int bg_index = 0;
{
const std::lock_guard<std::mutex> lock(mutex_);
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;
}
buffer.swap(buffer_tmp_[bg_index]);
width_[bg_index] = width;
height_[bg_index] = height;
}
inline const FlutterDesktopPixelBuffer *TextureRgba::buffer()
{
const std::lock_guard<std::mutex> lock(mutex_);
fg_index_ ^= 1;
return &this->flutter_pixel_buffer_;
}