diff --git a/windows/texture_rgba.cpp b/windows/texture_rgba.cpp index 5a1048d..e9c5058 100644 --- a/windows/texture_rgba.cpp +++ b/windows/texture_rgba.cpp @@ -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 lock(mutex_); - return this->buffer(); }); + { return this->buffer(); }); texture_ = std::make_unique(buffer); this->texture_id_ = texture_registrar->RegisterTexture(texture_.get()); } @@ -23,16 +19,28 @@ TextureRgba::~TextureRgba() void TextureRgba::MarkVideoFrameAvailable( std::vector &buffer, size_t width, size_t height) { - const std::lock_guard 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 lock(mutex_); + if (last_fg_index_ != fg_index_) + { + flutter_pixel_buffer_.buffer = static_cast(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 lock(mutex_); + fg_index_ ^= 1; return &this->flutter_pixel_buffer_; } diff --git a/windows/texture_rgba.h b/windows/texture_rgba.h index 8d68505..28b7eee 100644 --- a/windows/texture_rgba.h +++ b/windows/texture_rgba.h @@ -1,45 +1,10 @@ +#ifndef TEXTURE_RGBA_H_ +#define TEXTURE_RGBA_H_ + #include #include #include -#pragma once - -using namespace std; -using namespace std::chrono; -class Timer -{ -public: -Timer() : m_begin(high_resolution_clock::now()) {} -void reset() { m_begin = high_resolution_clock::now(); } -int64_t elapsed() const -{ -return duration_cast(high_resolution_clock::now() - m_begin).count(); -} -int64_t elapsed_micro() const -{ -return duration_cast(high_resolution_clock::now() - m_begin).count(); -} -int64_t elapsed_nano() const -{ -return duration_cast(high_resolution_clock::now() - m_begin).count(); -} -int64_t elapsed_seconds() const -{ -return duration_cast(high_resolution_clock::now() - m_begin).count(); -} -int64_t elapsed_minutes() const -{ -return duration_cast(high_resolution_clock::now() - m_begin).count(); -} -int64_t elapsed_hours() const -{ -return duration_cast(high_resolution_clock::now() - m_begin).count(); -} -private: -time_point m_begin; -}; - - class TextureRgba { public: @@ -58,7 +23,12 @@ private: std::unique_ptr texture_ = nullptr; int64_t texture_id_; mutable std::mutex mutex_; - std::vector buffer_tmp_; + int last_fg_index_ = 0; + int fg_index_ = 0; + size_t width_[2] = {0, 0}; + size_t height_[2] = {0, 0}; + std::vector buffer_tmp_[2]; Timer timer_; }; +#endif // TEXTURE_RGBA_H_