eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-05 23:40:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changed dt and fps computation in mixer

Browse Source
This commit is contained in:
brunoherbelin
2021-02-23 23:11:16 +01:00
parent 38f1288571
commit d0fdbeb14f
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Mixer.cpp
View File

@@ -110,7 +110,7 @@ static void saveSession(const std::string& filename, Session *session)
}
Mixer::Mixer() : session_(nullptr), back_session_(nullptr), current_view_(nullptr),
update_time_(GST_CLOCK_TIME_NONE), dt_(0.f)
/*update_time_(GST_CLOCK_TIME_NONE),*/ dt_(0.f), fps_(59.f)
{
// unsused initial empty session
session_ = new Session;
@@ -199,12 +199,13 @@ void Mixer::update()
}
// compute dt
if (update_time_ == GST_CLOCK_TIME_NONE)
update_time_ = gst_util_get_timestamp ();
guint64 current_time = gst_util_get_timestamp ();
// dt is in milisecond, with fractional precision (from micro seconds)
dt_ = static_cast<float>( GST_TIME_AS_USECONDS(current_time - update_time_) ) * 0.001f;
update_time_ = current_time;
static GTimer *timer = g_timer_new ();
dt_ = g_timer_elapsed (timer, NULL) * 1000.0;
g_timer_start(timer);
// compute fps
if (dt_ > 1.f)
fps_ = 1.f / (dt_+1.f) + 0.999f * fps_;
// update session and associated sources
session_->update(dt_);
@@ -1119,9 +1120,6 @@ void Mixer::swap()
current_source_ = session_->end();
current_source_index_ = -1;
// reset timer
update_time_ = GST_CLOCK_TIME_NONE;
// delete back (former front session)
garbage_.push_back(back_session_);
back_session_ = nullptr;