B252: keep closed textures valid until the engine is done with them
Windows: closeTexture hands the texture to UnregisterTexture's callback and frees its frame buffers there; frames pushed after close are dropped. Without "recycle" the object is kept for the process lifetime (the session may still hold its pointer); an engine that shuts down keeps its open textures the same way. A duplicate createTexture key gets -1, getTexturePtr of an unknown key 0. macOS: closeTexture drops the frame and closes the texture to later frames; only "recycle" removes it from the plugin. Linux: the frame handed to the engine last is freed at that engine's next copy_pixels or once the engine has shut down, not at close: from Flutter 3.32 the raster thread can still be uploading it. Tests: windows/test/run_tests.sh (plain, --asan, --tsan) and linux/test/run_tests.sh (plain, --asan). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
8cd34a80ff
commit
f38b9420ac
15 changed files with 1388 additions and 31 deletions
|
|
@ -1,3 +1,6 @@
|
|||
// Modified by the Kitedesk fork (2026, B252): no UnregisterTexture in the
|
||||
// destructor; Terminate and FreeBuffers for closeTexture.
|
||||
|
||||
#include "texture_rgba.h"
|
||||
#include <iostream>
|
||||
|
||||
|
|
@ -11,11 +14,6 @@ TextureRgba::TextureRgba(flutter::TextureRegistrar *texture_registrar)
|
|||
this->texture_id_ = texture_registrar->RegisterTexture(texture_.get());
|
||||
}
|
||||
|
||||
TextureRgba::~TextureRgba()
|
||||
{
|
||||
texture_registrar_->UnregisterTexture(texture_id_);
|
||||
}
|
||||
|
||||
void TextureRgba::MarkVideoFrameAvailable(
|
||||
std::vector<uint8_t> &buffer, size_t width, size_t height)
|
||||
{
|
||||
|
|
@ -45,6 +43,11 @@ void TextureRgba::MarkVideoFrameAvailable2(const uint8_t* buffer, const size_t b
|
|||
return;
|
||||
}
|
||||
const std::lock_guard<std::mutex> lock(mutex_);
|
||||
if (terminated_)
|
||||
{
|
||||
// Closed while the session still pushes frames to this pointer.
|
||||
return;
|
||||
}
|
||||
int bg_index = fg_index_ ^ 1;
|
||||
buffer_tmp_[bg_index].assign(buffer, buffer + buffer_length);
|
||||
width_[bg_index] = width;
|
||||
|
|
@ -61,6 +64,11 @@ void TextureRgba::MarkVideoFrameAvailable2(const uint8_t* buffer, const size_t b
|
|||
inline const FlutterDesktopPixelBuffer *TextureRgba::buffer()
|
||||
{
|
||||
const std::lock_guard<std::mutex> lock(mutex_);
|
||||
if (terminated_)
|
||||
{
|
||||
// Closed; the engine may draw the texture until it has unregistered it.
|
||||
return nullptr;
|
||||
}
|
||||
if (buff_ready_)
|
||||
{
|
||||
fg_index_ ^= 1;
|
||||
|
|
@ -71,3 +79,18 @@ inline const FlutterDesktopPixelBuffer *TextureRgba::buffer()
|
|||
}
|
||||
return &this->flutter_pixel_buffer_;
|
||||
}
|
||||
|
||||
void TextureRgba::Terminate()
|
||||
{
|
||||
const std::lock_guard<std::mutex> lock(mutex_);
|
||||
terminated_ = true;
|
||||
}
|
||||
|
||||
void TextureRgba::FreeBuffers()
|
||||
{
|
||||
const std::lock_guard<std::mutex> lock(mutex_);
|
||||
std::vector<uint8_t>().swap(buffer_tmp_[0]);
|
||||
std::vector<uint8_t>().swap(buffer_tmp_[1]);
|
||||
flutter_pixel_buffer_.buffer = nullptr;
|
||||
buff_ready_ = false;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue