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 07:22:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

armbox: gstreamer - fix init jump, cleanup

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 6f261730ff
Author: TangoCash <eric@loxat.de>
Date: 2017-10-21 (Sat, 21 Oct 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2017-10-21 18:28:57 +02:00
parent dec022b20c
commit a7b09ec32b
3 changed files with 57 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
libarmbox/playback_gst.cpp
View File

@@ -375,6 +375,7 @@ cPlayback::cPlayback(int num)
playing = false;
playstate = STATE_STOP;
decoders_closed = false;
}
cPlayback::~cPlayback()
@@ -387,6 +388,15 @@ cPlayback::~cPlayback()
bool cPlayback::Open(playmode_t PlayMode)
{
lt_info("%s: PlayMode %d\n", __func__, PlayMode);
if (PlayMode != PLAYMODE_TS)
{
audioDecoder->closeDevice();
videoDecoder->closeDevice();
decoders_closed = true;
}
init_jump = -1;
return true;
}
@@ -435,11 +445,12 @@ void cPlayback::Close(void)
m_gst_playbin = NULL;
videoDecoder->openDevice();
audioDecoder->openDevice();
//videoDemux->Start();
//audioDemux->Start();
if (decoders_closed)
{
audioDecoder->openDevice();
videoDecoder->openDevice();
decoders_closed = false;
}
}
}
@@ -460,6 +471,7 @@ bool cPlayback::Start(char *filename, int /*vpid*/, int /*vtype*/, int /*apid*/,
extra_headers.clear();
mAudioStream = 0;
init_jump = -1;
//create playback path
bool isHTTP = false;
@@ -511,13 +523,6 @@ bool cPlayback::Start(char *filename, int /*vpid*/, int /*vtype*/, int /*apid*/,
if(m_gst_playbin)
{
//videoDemux->Stop();
//audioDemux->Stop();
videoDecoder->closeDevice();
audioDecoder->closeDevice();
lt_info("%s:%s - m_gst_playbin\n", FILENAME, __FUNCTION__);
if(isHTTP)
@@ -540,10 +545,18 @@ bool cPlayback::Start(char *filename, int /*vpid*/, int /*vtype*/, int /*apid*/,
gst_object_unref(bus);
// state playing
gst_element_set_state(GST_ELEMENT(m_gst_playbin), GST_STATE_PLAYING);
if(isHTTP)
{
gst_element_set_state(GST_ELEMENT(m_gst_playbin), GST_STATE_PLAYING);
playstate = STATE_PLAY;
}
else
{
gst_element_set_state(GST_ELEMENT(m_gst_playbin), GST_STATE_PAUSED);
playstate = STATE_PAUSE;
}
playing = true;
playstate = STATE_PLAY;
}
else
{
@@ -642,6 +655,14 @@ bool cPlayback::SetSpeed(int speed)
{
lt_info( "%s:%s speed %d\n", FILENAME, __FUNCTION__, speed);
if (!decoders_closed)
{
audioDecoder->closeDevice();
videoDecoder->closeDevice();
decoders_closed = true;
usleep(500000);
}
if(playing == false)
return false;
@@ -676,6 +697,12 @@ bool cPlayback::SetSpeed(int speed)
//
playstate = STATE_REW;
}
if (init_jump > -1)
{
SetPosition(init_jump,true);
init_jump = -1;
}
}
mSpeed = speed;
@@ -753,15 +780,20 @@ bool cPlayback::SetPosition(int position, bool absolute)
{
lt_info("%s: pos %d abs %d playing %d\n", __func__, position, absolute, playing);
if(playing == false)
return false;
gint64 time_nanoseconds;
gint64 pos;
GstFormat fmt = GST_FORMAT_TIME;
GstState state;
if(m_gst_playbin)
{
gst_element_get_state(m_gst_playbin, &state, NULL, GST_CLOCK_TIME_NONE);
if ( state == GST_STATE_PAUSED )
{
init_jump = position;
return false;
}
if (!absolute)
{
gst_element_query_position(m_gst_playbin, fmt, &pos);