openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #926 from jeffski/qt-readers-sample-count

Browse Source 
Add GetSamplesPerFrame to QtTextReader and QtHtmlReader
This commit is contained in:
Jonathan Thomas
2023-06-02 16:21:09 -05:00
committed by GitHub
parent a6bcd42557 3b0f1d29b5
commit b1104d89ee
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/QtHtmlReader.cpp
View File

@@ -96,6 +96,7 @@ void QtHtmlReader::Open()
// Update image properties
info.has_audio = false;
info.has_video = true;
info.has_single_image = true;
info.file_size = 0;
info.vcodec = "QImage";
info.width = width;
@@ -144,12 +145,17 @@ void QtHtmlReader::Close()
// Get an openshot::Frame object for a specific frame number of this reader.
std::shared_ptr<Frame> QtHtmlReader::GetFrame(int64_t requested_frame)
{
// Create a scoped lock, allowing only a single thread to run the following code at one time
const std::lock_guard<std::recursive_mutex> lock(getFrameMutex);
auto sample_count = Frame::GetSamplesPerFrame(requested_frame, info.fps, info.sample_rate, info.channels);
if (image)
{
// Create or get frame object
auto image_frame = std::make_shared<Frame>(
requested_frame, image->size().width(), image->size().height(),
background_color, 0, 2);
background_color, sample_count, info.channels);
// Add Image data to frame
image_frame->AddImage(image);
@@ -159,12 +165,11 @@ std::shared_ptr<Frame> QtHtmlReader::GetFrame(int64_t requested_frame)
} else {
// return empty frame
auto image_frame = std::make_shared<Frame>(
1, 640, 480, background_color, 0, 2);
1, 640, 480, background_color, sample_count, info.channels);
// return frame object
return image_frame;
}
}
// Generate JSON string of this object

11
src/QtTextReader.cpp
View File

@@ -114,6 +114,7 @@ void QtTextReader::Open()
// Update image properties
info.has_audio = false;
info.has_video = true;
info.has_single_image = true;
info.file_size = 0;
info.vcodec = "QImage";
info.width = width;
@@ -162,12 +163,17 @@ void QtTextReader::Close()
// Get an openshot::Frame object for a specific frame number of this reader.
std::shared_ptr<Frame> QtTextReader::GetFrame(int64_t requested_frame)
{
// Create a scoped lock, allowing only a single thread to run the following code at one time
const std::lock_guard<std::recursive_mutex> lock(getFrameMutex);
auto sample_count = Frame::GetSamplesPerFrame(requested_frame, info.fps, info.sample_rate, info.channels);
if (image)
{
// Create or get frame object
auto image_frame = std::make_shared<Frame>(
requested_frame, image->size().width(), image->size().height(),
background_color, 0, 2);
background_color, sample_count, info.channels);
// Add Image data to frame
image_frame->AddImage(image);
@@ -176,12 +182,11 @@ std::shared_ptr<Frame> QtTextReader::GetFrame(int64_t requested_frame)
return image_frame;
} else {
// return empty frame
auto image_frame = std::make_shared<Frame>(1, 640, 480, background_color, 0, 2);
auto image_frame = std::make_shared<Frame>(1, 640, 480, background_color, sample_count, info.channels);
// return frame object
return image_frame;
}
}
// Generate JSON string of this object