oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

codec system rework

Browse Source 
Codecs are now much cleaner and thread safe by design.
This commit is contained in:
itsmattkc
2020-11-10 11:23:25 +11:00
parent 6ecdb02fd0
commit 94c0914e50
17 changed files with 932 additions and 1376 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/frame.cpp
+7 -65
View File
@@ -45,33 +45,14 @@ void Frame::set_video_params(const VideoParams &params)
{
params_ = params;
// Align linesize to 32
linesize_ = qCeil(static_cast<double>(width()) / 32.0) * 32;
linesize_ = generate_linesize_bytes(params_.width(), params_.format());
linesize_pixels_ = linesize_ / PixelFormat::BytesPerPixel(params_.format());
}
int Frame::linesize_pixels() const
int Frame::generate_linesize_bytes(int width, PixelFormat::Format format)
{
return linesize_;
}
int Frame::linesize_bytes() const
{
return linesize_pixels() * PixelFormat::BytesPerPixel(params_.format());
}
const int &Frame::width() const
{
return params_.effective_width();
}
const int &Frame::height() const
{
return params_.effective_height();
}
const PixelFormat::Format &Frame::format() const
{
return params_.format();
// Align to 32 bytes (not sure if this is necessary?)
return ((PixelFormat::BytesPerPixel(format) * width) + 31) & ~31;
}
Color Frame::get_pixel(int x, int y) const
@@ -80,9 +61,7 @@ Color Frame::get_pixel(int x, int y) const
return Color();
}
int pixel_index = y * linesize_pixels() + x;
int byte_offset = PixelFormat::GetBufferSize(video_params().format(), pixel_index, 1);
int byte_offset = y * linesize_bytes() + x * PixelFormat::BytesPerPixel(video_params().format());
return Color(data_.data() + byte_offset, video_params().format());
}
@@ -98,33 +77,11 @@ void Frame::set_pixel(int x, int y, const Color &c)
return;
}
int pixel_index = y * linesize_pixels() + x;
int byte_offset = PixelFormat::GetBufferSize(video_params().format(), pixel_index, 1);
int byte_offset = y * linesize_bytes() + x * PixelFormat::BytesPerPixel(video_params().format());
c.toData(data_.data() + byte_offset, video_params().format());
}
const rational &Frame::timestamp() const
{
return timestamp_;
}
void Frame::set_timestamp(const rational &timestamp)
{
timestamp_ = timestamp;
}
char *Frame::data()
{
return data_.data();
}
const char *Frame::const_data() const
{
return data_.constData();
}
void Frame::allocate()
{
// Assume this frame is intended to be a video frame
@@ -136,19 +93,4 @@ void Frame::allocate()
data_.resize(PixelFormat::GetBufferSize(params_.format(), linesize_, params_.height()));
}
bool Frame::is_allocated() const
{
return !data_.isEmpty();
}
void Frame::destroy()
{
data_.clear();
}
int Frame::allocated_size() const
{
return data_.size();
}
OLIVE_NAMESPACE_EXIT