mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-27 23:42:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tangocash/master'

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 4c616f5cf1
Author: max_10 <max_10@gmx.de>
Date: 2017-10-24 (Tue, 24 Oct 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2017-10-24 19:37:46 +02:00
parent 219ebdd6c4 89c8a1aaf4
commit 429f6db2b1
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libarmbox/playback_gst.cpp
View File

@@ -383,6 +383,8 @@ cPlayback::~cPlayback()
{ {
lt_info( "%s:%s\n", FILENAME, __FUNCTION__); lt_info( "%s:%s\n", FILENAME, __FUNCTION__);
//FIXME: all deleting stuff is done in Close() //FIXME: all deleting stuff is done in Close()
if (m_stream_tags)
gst_tag_list_free(m_stream_tags);
} }
//Used by Fileplay //Used by Fileplay
@@ -418,9 +420,6 @@ void cPlayback::Close(void)
lt_info( "%s:%s - GST bus handler closed\n", FILENAME, __FUNCTION__); lt_info( "%s:%s - GST bus handler closed\n", FILENAME, __FUNCTION__);
} }
if (m_stream_tags)
gst_tag_list_free(m_stream_tags);
// close gst // close gst
if (m_gst_playbin) if (m_gst_playbin)
{ {
@@ -748,13 +747,18 @@ bool cPlayback::GetPosition(int &position, int &duration)
{ {
//position //position
GstFormat fmt = GST_FORMAT_TIME; //Returns time in nanosecs GstFormat fmt = GST_FORMAT_TIME; //Returns time in nanosecs
gint64 pts = 0; gint64 pts = 0;
unsigned long long int sec = 0; if (audioSink || videoSink)
{
gst_element_query_position(m_gst_playbin, fmt, &pts); g_signal_emit_by_name(audioSink ? audioSink : videoSink, "get-decoder-time", &pts);
if (!GST_CLOCK_TIME_IS_VALID(pts)){
lt_info( "%s - %d failed\n", __FUNCTION__, __LINE__);
}
}else{
if(!gst_element_query_position(m_gst_playbin, fmt, &pts))
lt_info( "%s - %d failed\n", __FUNCTION__, __LINE__);
}
position = pts / 1000000.0; position = pts / 1000000.0;
// duration // duration
GstFormat fmt_d = GST_FORMAT_TIME; //Returns time in nanosecs GstFormat fmt_d = GST_FORMAT_TIME; //Returns time in nanosecs
double length = 0; double length = 0;