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

libspark/playback_libeplayer3: switch to lt_info/lt_debug

Browse Source 
Conflicts:
	libspark/playback_libeplayer3.cpp


Origin commit data
------------------
Branch: master
Commit: 5f134156a9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-13 (Fri, 13 Feb 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-02-13 19:26:12 +01:00
committed by max_10
parent 7eb1f51a83
commit e5d55c559a
1 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
libspark/playback_libeplayer3.cpp
View File

@@ -9,8 +9,11 @@
#include <video_lib.h> #include <video_lib.h>
#include "player.h" #include "player.h"
#include "playback_libeplayer3.h" #include "playback_libeplayer3.h"
#include "lt_debug.h"
#define lt_debug(args...) _lt_debug(HAL_DEBUG_PLAYBACK, this, args)
#define lt_info(args...) _lt_info(HAL_DEBUG_PLAYBACK, this, args)
extern cAudio *audioDecoder; extern cAudio *audioDecoder;
extern cVideo *videoDecoder; extern cVideo *videoDecoder;
@@ -18,7 +21,8 @@ extern cVideo *videoDecoder;
//Used by Fileplay //Used by Fileplay
bool cPlayback::Open(playmode_t PlayMode) bool cPlayback::Open(playmode_t PlayMode)
{ {
if (PlayMode != PLAYMODE_TS) { if (PlayMode != PLAYMODE_TS)
{
audioDecoder->closeDevice(); audioDecoder->closeDevice();
videoDecoder->closeDevice(); videoDecoder->closeDevice();
decoders_closed = true; decoders_closed = true;
@@ -36,11 +40,12 @@ bool cPlayback::Open(playmode_t PlayMode)
void cPlayback::Close(void) void cPlayback::Close(void)
{ {
printf("%s %s %d\n", __FILE__, __func__, __LINE__); lt_info("%s\n", __func__);
//Dagobert: movieplayer does not call stop, it calls close ;) //Dagobert: movieplayer does not call stop, it calls close ;)
Stop(); Stop();
if (decoders_closed) { if (decoders_closed)
{
audioDecoder->openDevice(); audioDecoder->openDevice();
videoDecoder->openDevice(); videoDecoder->openDevice();
decoders_closed = false; decoders_closed = false;
@@ -53,7 +58,7 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
bool isHTTP = false; bool isHTTP = false;
no_probe = false; no_probe = false;
fprintf(stderr, "%s:%s - filename=%s vpid=%u vtype=%d apid=%u ac3=%d\n", __FILE__, __func__, filename, vpid, vtype, apid, ac3); lt_info("%s - filename=%s vpid=%u vtype=%d apid=%u ac3=%d\n", __func__, filename, vpid, vtype, apid, ac3);
init_jump = -1; init_jump = -1;
@@ -92,7 +97,6 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
return false; return false;
} }
selected_program = atoi(key); selected_program = atoi(key);
} else if (keys.size() > 0) } else if (keys.size() > 0)
selected_program = atoi(keys[0].c_str()); selected_program = atoi(keys[0].c_str());
@@ -109,12 +113,13 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
playing = ret = player->Pause(); playing = ret = player->Pause();
} }
} }
return ret; return ret;
} }
bool cPlayback::Stop(void) bool cPlayback::Stop(void)
{ {
printf("%s:%s playing %d\n", __FILE__, __func__, playing); lt_info("%s playing %d\n", __func__, playing);
player->Stop(); player->Stop();
player->output.Close(); player->output.Close();
@@ -126,6 +131,7 @@ bool cPlayback::Stop(void)
bool cPlayback::SetAPid(int pid, bool /* ac3 */) bool cPlayback::SetAPid(int pid, bool /* ac3 */)
{ {
lt_info("%s\n", __func__);
return player->SwitchAudio(pid); return player->SwitchAudio(pid);
} }
@@ -146,9 +152,10 @@ bool cPlayback::SetTeletextPid(int pid)
bool cPlayback::SetSpeed(int speed) bool cPlayback::SetSpeed(int speed)
{ {
printf("%s:%s playing %d speed %d\n", __FILE__, __func__, playing, speed); lt_info("%s playing %d speed %d\n", __func__, playing, speed);
if (!decoders_closed) { if (!decoders_closed)
{
audioDecoder->closeDevice(); audioDecoder->closeDevice();
videoDecoder->closeDevice(); videoDecoder->closeDevice();
decoders_closed = true; decoders_closed = true;
@@ -157,11 +164,11 @@ bool cPlayback::SetSpeed(int speed)
playing = player->Play(); playing = player->Play();
} }
if(!playing) if (!playing)
return false; return false;
bool res = true; bool res = true;
nPlaybackSpeed = speed; nPlaybackSpeed = speed;
if (speed > 1) { if (speed > 1) {
@@ -188,11 +195,13 @@ bool cPlayback::SetSpeed(int speed)
SetPosition(init_jump); SetPosition(init_jump);
init_jump = -1; init_jump = -1;
} }
return res; return res;
} }
bool cPlayback::GetSpeed(int &speed) const bool cPlayback::GetSpeed(int &speed) const
{ {
lt_debug("%s\n", __func__);
speed = nPlaybackSpeed; speed = nPlaybackSpeed;
return true; return true;
} }
@@ -206,16 +215,21 @@ void cPlayback::GetPts(uint64_t &pts)
bool cPlayback::GetPosition(int &position, int &duration) bool cPlayback::GetPosition(int &position, int &duration)
{ {
bool got_duration = false; bool got_duration = false;
lt_debug("%s %d %d\n", __func__, position, duration);
/* hack: if the file is growing (timeshift), then determine its length /* hack: if the file is growing (timeshift), then determine its length
* by comparing the mtime with the mtime of the xml file */ * by comparing the mtime with the mtime of the xml file */
if (pm == PLAYMODE_TS) { if (pm == PLAYMODE_TS)
{
struct stat64 s; struct stat64 s;
if (!stat64(fn_ts.c_str(), &s)) { if (!stat64(fn_ts.c_str(), &s))
if (!playing || last_size != s.st_size) { {
if (!playing || last_size != s.st_size)
{
last_size = s.st_size; last_size = s.st_size;
time_t curr_time = s.st_mtime; time_t curr_time = s.st_mtime;
if (!stat64(fn_xml.c_str(), &s)) { if (!stat64(fn_xml.c_str(), &s))
{
duration = (curr_time - s.st_mtime) * 1000; duration = (curr_time - s.st_mtime) * 1000;
if (!playing) if (!playing)
return true; return true;
@@ -229,9 +243,9 @@ bool cPlayback::GetPosition(int &position, int &duration)
return false; return false;
if (!player->isPlaying) { if (!player->isPlaying) {
printf("cPlayback::%s !!!!EOF!!!! < -1\n", __func__); lt_info("%s !!!!EOF!!!! < -1\n", __func__);
position = duration + 1000; position = duration;
return false; return true;
} }
int64_t vpts = 0; int64_t vpts = 0;
@@ -261,7 +275,9 @@ bool cPlayback::GetPosition(int &position, int &duration)
bool cPlayback::SetPosition(int position, bool absolute) bool cPlayback::SetPosition(int position, bool absolute)
{ {
if (!playing) { lt_info("%s %d\n", __func__, position);
if (!playing)
{
/* the calling sequence is: /* the calling sequence is:
* Start() - paused * Start() - paused
* SetPosition() - which fails if not running * SetPosition() - which fails if not running
@@ -277,6 +293,7 @@ bool cPlayback::SetPosition(int position, bool absolute)
void cPlayback::FindAllPids(int *pids, unsigned int *ac3flags, unsigned int *numpids, std::string *language) void cPlayback::FindAllPids(int *pids, unsigned int *ac3flags, unsigned int *numpids, std::string *language)
{ {
lt_info("%s\n", __func__);
unsigned int i = 0; unsigned int i = 0;
std::vector<Track> tracks = player->manager.getAudioTracks(); std::vector<Track> tracks = player->manager.getAudioTracks();
@@ -286,12 +303,12 @@ void cPlayback::FindAllPids(int *pids, unsigned int *ac3flags, unsigned int *num
language[i] = it->title; language[i] = it->title;
i++; i++;
} }
*numpids = i; *numpids = i;
} }
void cPlayback::FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language) void cPlayback::FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language)
{ {
lt_info("%s\n", __func__);
unsigned int i = 0; unsigned int i = 0;
std::vector<Track> tracks = player->manager.getSubtitleTracks(); std::vector<Track> tracks = player->manager.getSubtitleTracks();
@@ -306,6 +323,7 @@ void cPlayback::FindAllSubtitlePids(int *pids, unsigned int *numpids, std::strin
void cPlayback::FindAllTeletextsubtitlePids(int *pids, unsigned int *numpids, std::string *language, int *mags, int *pages) void cPlayback::FindAllTeletextsubtitlePids(int *pids, unsigned int *numpids, std::string *language, int *mags, int *pages)
{ {
lt_info("%s\n", __func__);
unsigned int i = 0; unsigned int i = 0;
std::vector<Track> tracks = player->manager.getTeletextTracks(); std::vector<Track> tracks = player->manager.getTeletextTracks();
@@ -340,6 +358,7 @@ void cPlayback::FindAllSubs(uint16_t * /*pids*/, unsigned short * /*supp*/, uint
bool cPlayback::SelectSubtitles(int /*pid*/) bool cPlayback::SelectSubtitles(int /*pid*/)
{ {
lt_info("%s pid %d\n", __func__, pid);
return false; return false;
} }
@@ -366,6 +385,7 @@ void cPlayback::GetMetadata(std::vector<std::string> &keys, std::vector<std::str
cPlayback::cPlayback(int num __attribute__((unused))) cPlayback::cPlayback(int num __attribute__((unused)))
{ {
lt_info("%s\n", __func__);
playing = false; playing = false;
decoders_closed = false; decoders_closed = false;
ProgramSelectionCallback = NULL; ProgramSelectionCallback = NULL;
@@ -376,6 +396,7 @@ cPlayback::cPlayback(int num __attribute__((unused)))
cPlayback::~cPlayback() cPlayback::~cPlayback()
{ {
lt_info("%s\n", __func__);
delete player; delete player;
} }
@@ -395,6 +416,7 @@ uint64_t cPlayback::GetReadCount() {
int cPlayback::GetAPid(void) int cPlayback::GetAPid(void)
{ {
lt_info("%s\n", __func__);
return player->GetAudioPid(); return player->GetAudioPid();
} }