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

Adding pre-roll to VideoCacheThread, and making video & audio threads wait for the isReady() method before playing. Also fixed an audio bug where our internal buffer was not being cleared on seek. Removed some unused caching from Clip, and did some minor refactor on FrameMapper/Clip cache clearing.

Browse Source
This commit is contained in:
Jonathan Thomas
2022-01-26 17:56:33 -06:00
parent f1c2cc06de
commit 133bae40c3
13 changed files with 137 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Qt/VideoCacheThread.cpp
View File

@@ -27,7 +27,8 @@ namespace openshot
// Constructor
VideoCacheThread::VideoCacheThread()
: Thread("video-cache"), speed(1), is_playing(false),
reader(NULL), max_frames_ahead(OPEN_MP_NUM_PROCESSORS * 2), current_display_frame(1)
reader(NULL), current_display_frame(1), cached_frame_count(0),
min_frames_ahead(12), max_frames_ahead(OPEN_MP_NUM_PROCESSORS * 6)
{
}
@@ -39,9 +40,18 @@ namespace openshot
// Seek the reader to a particular frame number
void VideoCacheThread::Seek(int64_t new_position)
{
current_display_frame = new_position;
requested_display_frame = new_position;
}
// Seek the reader to a particular frame number and optionally start the pre-roll
void VideoCacheThread::Seek(int64_t new_position, bool start_preroll)
{
if (start_preroll && reader && reader->GetCache() && !reader->GetCache()->Contains(new_position)) {
cached_frame_count = 0;
}
Seek(new_position);
}
// Play the video
void VideoCacheThread::Play() {
// Start playing
@@ -54,6 +64,11 @@ namespace openshot
is_playing = false;
}
// Is cache ready for playback (pre-roll)
bool VideoCacheThread::isReady() {
return (cached_frame_count > min_frames_ahead);
}
// Start the thread
void VideoCacheThread::run()
{
@@ -73,13 +88,18 @@ namespace openshot
bytes_per_frame = last_cached_frame->GetBytes();
}
// Calculate # of frames on Timeline cache
// Calculate # of frames on Timeline cache (when paused)
if (reader->GetCache() && reader->GetCache()->GetMaxBytes() > 0) {
// Use 1/2 the cache size (so our cache will be 50% before the play-head, and 50% after it)
max_frames_ahead = (reader->GetCache()->GetMaxBytes() / bytes_per_frame) / 2;
if (max_frames_ahead > 1000) {
// Ignore values that are too large, and default to a safer value
max_frames_ahead = OPEN_MP_NUM_PROCESSORS * 2;
if (speed == 0) {
// When paused, use 1/2 the cache size (so our cache will be 50% before the play-head, and 50% after it)
max_frames_ahead = (reader->GetCache()->GetMaxBytes() / bytes_per_frame) / 2;
if (max_frames_ahead > 300) {
// Ignore values that are too large, and default to a safer value
max_frames_ahead = 300;
}
} else {
// When playing back video (speed == 1), keep cache # small
max_frames_ahead = min_frames_ahead;
}
}
@@ -100,7 +120,9 @@ namespace openshot
ending_frame = starting_frame - max_frames_ahead;
}
// Loop through range of frames (and cache them)
for (int64_t cache_frame = starting_frame; cache_frame != ending_frame; cache_frame += increment) {
cached_frame_count++;
if (reader && reader->GetCache() && !reader->GetCache()->Contains(cache_frame)) {
try
{
@@ -110,8 +132,20 @@ namespace openshot
}
catch (const OutOfBoundsFrame & e) { }
}
// Check if the user has seeked outside the cache range
if (requested_display_frame != current_display_frame) {
// cache will restart at a new position
if (speed >= 0 && (requested_display_frame < starting_frame || requested_display_frame > ending_frame)) {
break;
} else if (speed < 0 && (requested_display_frame > starting_frame || requested_display_frame < ending_frame)) {
break;
}
}
}
// Update current display frame
current_display_frame = requested_display_frame;
// Sleep for a fraction of frame duration
std::this_thread::sleep_for(frame_duration / 4);
}