From e8026b92cd20a70a93f63ad07de59972ac2bba30 Mon Sep 17 00:00:00 2001 From: max_10 Date: Tue, 24 Oct 2017 00:19:29 +0200 Subject: [PATCH 1/3] eDVBCISlot forgotten Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/2d571948d88917818f69e97239c2c7d334d5cf50 Author: max_10 Date: 2017-10-24 (Tue, 24 Oct 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- common/ca_ci.cpp | 2 +- libdvbci/dvbci_datetimemgr.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/ca_ci.cpp b/common/ca_ci.cpp index 0ef216f..165f13d 100644 --- a/common/ca_ci.cpp +++ b/common/ca_ci.cpp @@ -249,7 +249,7 @@ static bool sendRCV(eDVBCISlot* slot) } //send some data on an fd, for a special slot and connection_id -eData sendData(tSlot* slot, unsigned char* data, int len) +eData sendData(eDVBCISlot* slot, unsigned char* data, int len) { // only poll connection if we are not awaiting an answer slot->pollConnection = false; diff --git a/libdvbci/dvbci_datetimemgr.cpp b/libdvbci/dvbci_datetimemgr.cpp index b46e13f..26dbd79 100644 --- a/libdvbci/dvbci_datetimemgr.cpp +++ b/libdvbci/dvbci_datetimemgr.cpp @@ -63,7 +63,7 @@ void eDVBCIDateTimeSession::sendDateTime() struct tm tm_loc; unsigned char tag[3] = {0x9f, 0x84, 0x41}; // date_time_response unsigned char msg[7] = {0, 0, 0, 0, 0, 0, 0}; - printf("%s -> %s\n", FILENAME, __FUNCTION__); + printf("[CI DT] -> %s\n", __FUNCTION__); time_t t = time(NULL); if ( gmtime_r(&t, &tm_gmt) && localtime_r(&t, &tm_loc) ) { From d01a02bbb117811b753aa565c0d7933e5aadcbc8 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 24 Oct 2017 18:32:36 +0200 Subject: [PATCH 2/3] fix null list Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/95ff777250b40e4efb6d399b127d8e7bef499b62 Author: Jacek Jendrzej Date: 2017-10-24 (Tue, 24 Oct 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/playback_gst.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libarmbox/playback_gst.cpp b/libarmbox/playback_gst.cpp index 548d22f..c902232 100644 --- a/libarmbox/playback_gst.cpp +++ b/libarmbox/playback_gst.cpp @@ -383,6 +383,8 @@ cPlayback::~cPlayback() { lt_info( "%s:%s\n", FILENAME, __FUNCTION__); //FIXME: all deleting stuff is done in Close() + if (m_stream_tags) + gst_tag_list_free(m_stream_tags); } //Used by Fileplay @@ -418,9 +420,6 @@ void cPlayback::Close(void) lt_info( "%s:%s - GST bus handler closed\n", FILENAME, __FUNCTION__); } - if (m_stream_tags) - gst_tag_list_free(m_stream_tags); - // close gst if (m_gst_playbin) { From ccfd5f9625b0bb9a3076a53511c8ce6e85f9d477 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 24 Oct 2017 15:57:30 +0200 Subject: [PATCH 3/3] fix get play position Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/cb33592f3c2e964e339b7ad5644036d131c6bf03 Author: Jacek Jendrzej Date: 2017-10-24 (Tue, 24 Oct 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/playback_gst.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/libarmbox/playback_gst.cpp b/libarmbox/playback_gst.cpp index c902232..3c852be 100644 --- a/libarmbox/playback_gst.cpp +++ b/libarmbox/playback_gst.cpp @@ -747,13 +747,18 @@ bool cPlayback::GetPosition(int &position, int &duration) { //position GstFormat fmt = GST_FORMAT_TIME; //Returns time in nanosecs - gint64 pts = 0; - unsigned long long int sec = 0; - - gst_element_query_position(m_gst_playbin, fmt, &pts); + if (audioSink || videoSink) + { + 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; - // duration GstFormat fmt_d = GST_FORMAT_TIME; //Returns time in nanosecs double length = 0;