mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: reset decode buffer zero when scale width changed 

Change-Id: Iaa2f99111dd5f7228b7b25e1be0a8cbdbfe982a6
Jira: STUDIO-8422
This commit is contained in:
chunmao.guo 2024-10-12 11:33:52 +08:00 committed by Lane.Wei
parent 0263b6d2bd
commit 659ebc7d07
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/slic3r/GUI/AVVideoDecoder.cpp
View File

@ -76,8 +76,13 @@ bool AVVideoDecoder::toWxImage(wxImage &image, wxSize const &size2)
if (!size1.IsFullySpecified()) if (!size1.IsFullySpecified())
size1 = {frame_->width, frame_->height }; size1 = {frame_->width, frame_->height };
auto size = size1; auto size = size1;
if (size.GetWidth() & 0x0f) if (size.GetWidth() & 0x0f) {
size.SetWidth((size.GetWidth() & ~0x0f) + 0x10); size.SetWidth((size.GetWidth() & ~0x0f) + 0x10);
if (size.GetWidth() != width_) {
std::fill(bits_.begin(), bits_.end(), 0);
width_ = size.GetWidth();
}
}
AVPixelFormat wxFmt = AV_PIX_FMT_RGB24; AVPixelFormat wxFmt = AV_PIX_FMT_RGB24;
sws_ctx_ = sws_getCachedContext(sws_ctx_, sws_ctx_ = sws_getCachedContext(sws_ctx_,
frame_->width, frame_->height, AVPixelFormat(frame_->format), frame_->width, frame_->height, AVPixelFormat(frame_->format),
@ -112,8 +117,13 @@ bool AVVideoDecoder::toWxBitmap(wxBitmap &bitmap, wxSize const &size2)
if (!size1.IsFullySpecified()) if (!size1.IsFullySpecified())
size1 = {frame_->width, frame_->height }; size1 = {frame_->width, frame_->height };
auto size = size1; auto size = size1;
if (size.GetWidth() & 0x0f) if (size.GetWidth() & 0x0f) {
size.SetWidth((size.GetWidth() & ~0x0f) + 0x10); size.SetWidth((size.GetWidth() & ~0x0f) + 0x10);
if (size.GetWidth() != width_) {
std::fill(bits_.begin(), bits_.end(), 0);
width_ = size.GetWidth();
}
}
AVPixelFormat wxFmt = AV_PIX_FMT_RGB32; AVPixelFormat wxFmt = AV_PIX_FMT_RGB32;
sws_ctx_ = sws_getCachedContext(sws_ctx_, sws_ctx_ = sws_getCachedContext(sws_ctx_,
frame_->width, frame_->height, AVPixelFormat(frame_->format), frame_->width, frame_->height, AVPixelFormat(frame_->format),

1
src/slic3r/GUI/AVVideoDecoder.hpp
View File

@ -34,6 +34,7 @@ private:
AVFrame * frame_ = nullptr; AVFrame * frame_ = nullptr;
SwsContext * sws_ctx_ = nullptr; SwsContext * sws_ctx_ = nullptr;
bool got_frame_ = false; bool got_frame_ = false;
int width_ { 0 }; // scale result width
std::vector<uint8_t> bits_; std::vector<uint8_t> bits_;
}; };