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

Bugfix MediaPlayer, ButtonOpenUrl and UserInterfaceManager

Browse Source
This commit is contained in:
brunoherbelin
2020-05-21 14:12:36 +02:00
parent 34c9d85863
commit 5b489dd2df
10 changed files with 102 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
MediaPlayer.cpp
View File

@@ -610,7 +610,7 @@ double MediaPlayer::updateFrameRate() const
// CALLBACKS
bool MediaPlayer::fill_v_frame(GstBuffer *buf)
bool MediaPlayer::fill_v_frame(GstBuffer *buf, bool ignorepts)
{
// always empty frame before filling it again
if (v_frame_.buffer)
@@ -618,7 +618,7 @@ bool MediaPlayer::fill_v_frame(GstBuffer *buf)
// get the frame from buffer
if ( !gst_video_frame_map (&v_frame_, &v_frame_video_info_, buf, GST_MAP_READ ) ) {
Log::Info("MediaPlayer %s Failed to map the video buffer");
Log::Info("MediaPlayer %s Failed to map the video buffer", id_.c_str());
return false;
}
@@ -626,7 +626,8 @@ bool MediaPlayer::fill_v_frame(GstBuffer *buf)
if( GST_VIDEO_INFO_IS_RGB(&(v_frame_).info) && GST_VIDEO_INFO_N_PLANES(&(v_frame_).info) == 1) {
// validate time
if (position_ != buf->pts) {
if (ignorepts || position_ != buf->pts)
{
// got a new RGB frame !
v_frame_is_full_ = true;
@@ -664,7 +665,7 @@ GstFlowReturn MediaPlayer::callback_pull_sample_video (GstElement *bin, MediaPla
GstBuffer *buf = gst_buffer_ref ( gst_sample_get_buffer (sample) );
// fill frame from buffer
if ( !m->fill_v_frame(buf) )
if ( !m->fill_v_frame(buf, m->isimage_) )
ret = GST_FLOW_ERROR;
// free buffer
gst_buffer_unref (buf);