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

libarmbox: Code formatting playback_libeplayer3

Browse Source 
Origin commit data
------------------
Branch: master
Commit: e786616117
Author: max_10 <max_10@gmx.de>
Date: 2017-12-28 (Thu, 28 Dec 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-12-28 11:23:29 +01:00
parent 1080ea0c61
commit a31afe9151
2 changed files with 203 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
libarmbox/playback_libeplayer3.cpp
View File

@@ -28,7 +28,8 @@ extern cVideo *videoDecoder;
//Used by Fileplay //Used by Fileplay
bool cPlayback::Open(playmode_t PlayMode) bool cPlayback::Open(playmode_t PlayMode)
{ {
const char *aPLAYMODE[] = { const char *aPLAYMODE[] =
{
"PLAYMODE_TS", "PLAYMODE_TS",
"PLAYMODE_FILE" "PLAYMODE_FILE"
}; };
@@ -131,13 +132,16 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
else else
{ {
//AUDIO //AUDIO
if(player && player->manager && player->manager->audio) { if (player && player->manager && player->manager->audio)
{
char ** TrackList = NULL; char ** TrackList = NULL;
player->manager->audio->Command(player, MANAGER_LIST, &TrackList); player->manager->audio->Command(player, MANAGER_LIST, &TrackList);
if (TrackList != NULL) { if (TrackList != NULL)
{
printf("AudioTrack List\n"); printf("AudioTrack List\n");
int i = 0; int i = 0;
for (i = 0; TrackList[i] != NULL; i+=2) { for (i = 0; TrackList[i] != NULL; i+=2)
{
printf("\t%s - %s\n", TrackList[i], TrackList[i+1]); printf("\t%s - %s\n", TrackList[i], TrackList[i+1]);
free(TrackList[i]); free(TrackList[i]);
free(TrackList[i+1]); free(TrackList[i+1]);
@@ -146,13 +150,16 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
} }
} }
//SUB //SUB
if(player && player->manager && player->manager->subtitle) { if (player && player->manager && player->manager->subtitle)
{
char ** TrackList = NULL; char ** TrackList = NULL;
player->manager->subtitle->Command(player, MANAGER_LIST, &TrackList); player->manager->subtitle->Command(player, MANAGER_LIST, &TrackList);
if (TrackList != NULL) { if (TrackList != NULL)
{
printf("SubtitleTrack List\n"); printf("SubtitleTrack List\n");
int i = 0; int i = 0;
for (i = 0; TrackList[i] != NULL; i+=2) { for (i = 0; TrackList[i] != NULL; i+=2)
{
printf("\t%s - %s\n", TrackList[i], TrackList[i+1]); printf("\t%s - %s\n", TrackList[i], TrackList[i+1]);
free(TrackList[i]); free(TrackList[i]);
free(TrackList[i+1]); free(TrackList[i+1]);
@@ -162,13 +169,16 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
} }
/* /*
//Teletext //Teletext
if(player && player->manager && player->manager->teletext) { if (player && player->manager && player->manager->teletext)
{
char ** TrackList = NULL; char ** TrackList = NULL;
player->manager->teletext->Command(player, MANAGER_LIST, &TrackList); player->manager->teletext->Command(player, MANAGER_LIST, &TrackList);
if (TrackList != NULL) { if (TrackList != NULL)
{
printf("TeletextTrack List\n"); printf("TeletextTrack List\n");
int i = 0; int i = 0;
for (i = 0; TrackList[i] != NULL; i+=2) { for (i = 0; TrackList[i] != NULL; i+=2)
{
printf("\t%s - %s\n", TrackList[i], TrackList[i+1]); printf("\t%s - %s\n", TrackList[i], TrackList[i+1]);
free(TrackList[i]); free(TrackList[i]);
free(TrackList[i+1]); free(TrackList[i+1]);
@@ -178,13 +188,16 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, in
} }
*/ */
//Chapters //Chapters
if(player && player->manager && player->manager->chapter) { if (player && player->manager && player->manager->chapter)
{
char ** TrackList = NULL; char ** TrackList = NULL;
player->manager->chapter->Command(player, MANAGER_LIST, &TrackList); player->manager->chapter->Command(player, MANAGER_LIST, &TrackList);
if (TrackList != NULL) { if (TrackList != NULL)
{
printf("Chapter List\n"); printf("Chapter List\n");
int i = 0; int i = 0;
for (i = 0; TrackList[i] != NULL; i+=2) { for (i = 0; TrackList[i] != NULL; i+=2)
{
printf("\t%s - %s\n", TrackList[i], TrackList[i+1]); printf("\t%s - %s\n", TrackList[i], TrackList[i+1]);
free(TrackList[i]); free(TrackList[i]);
free(TrackList[i+1]); free(TrackList[i+1]);
@@ -433,48 +446,53 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu
lt_info("%s\n", __func__); lt_info("%s\n", __func__);
int max_numpida = *numpida; int max_numpida = *numpida;
*numpida = 0; *numpida = 0;
if(player && player->manager && player->manager->audio) { if (player && player->manager && player->manager->audio)
char ** TrackList = NULL; {
char **TrackList = NULL;
player->manager->audio->Command(player, MANAGER_LIST, &TrackList); player->manager->audio->Command(player, MANAGER_LIST, &TrackList);
if (TrackList != NULL) { if (TrackList != NULL)
{
printf("AudioTrack List\n"); printf("AudioTrack List\n");
int i = 0,j=0; int i = 0, j = 0;
for (i = 0,j=0; TrackList[i] != NULL; i+=2,j++) { for (i = 0, j = 0; TrackList[i] != NULL; i += 2, j++)
printf("\t%s - %s\n", TrackList[i], TrackList[i+1]); {
if (j < max_numpida) { printf("\t%s - %s\n", TrackList[i], TrackList[i + 1]);
if (j < max_numpida)
{
int _pid; int _pid;
char _lang[strlen(TrackList[i])]; char _lang[strlen(TrackList[i])];
if (2 == sscanf(TrackList[i], "%d %s\n", &_pid, _lang)) { if (2 == sscanf(TrackList[i], "%d %s\n", &_pid, _lang))
apids[j]=_pid; {
apids[j] = _pid;
// atUnknown, atMPEG, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG, atFLAC // atUnknown, atMPEG, atMP3, atAC3, atDTS, atAAC, atPCM, atOGG, atFLAC
if( !strncmp("A_MPEG/L3", TrackList[i+1], 9)) if (!strncmp("A_MPEG/L3", TrackList[i + 1], 9))
ac3flags[j] = 3; ac3flags[j] = 3;
if( !strncmp("A_MP3", TrackList[i+1], 5)) if (!strncmp("A_MP3", TrackList[i + 1], 5))
ac3flags[j] = 4; ac3flags[j] = 4;
else if(!strncmp("A_AC3", TrackList[i+1], 5)) else if (!strncmp("A_AC3", TrackList[i + 1], 5))
ac3flags[j] = 1; ac3flags[j] = 1;
else if(!strncmp("A_EAC3", TrackList[i+1], 6)) else if (!strncmp("A_EAC3", TrackList[i + 1], 6))
ac3flags[j] = 7; ac3flags[j] = 7;
else if(!strncmp("A_DTS", TrackList[i+1], 5)) else if (!strncmp("A_DTS", TrackList[i + 1], 5))
ac3flags[j] = 6; ac3flags[j] = 6;
else if(!strncmp("A_AAC", TrackList[i+1], 5)) else if (!strncmp("A_AAC", TrackList[i + 1], 5))
ac3flags[j] = 5; ac3flags[j] = 5;
else if(!strncmp("A_PCM", TrackList[i+1], 5)) else if (!strncmp("A_PCM", TrackList[i + 1], 5))
ac3flags[j] = 0; //todo ac3flags[j] = 0; //todo
else if(!strncmp("A_VORBIS", TrackList[i+1], 8)) else if (!strncmp("A_VORBIS", TrackList[i + 1], 8))
ac3flags[j] = 0; //todo ac3flags[j] = 0; //todo
else if(!strncmp("A_FLAC", TrackList[i+1], 6)) else if (!strncmp("A_FLAC", TrackList[i + 1], 6))
ac3flags[j] = 0; //todo ac3flags[j] = 0; //todo
else else
ac3flags[j] = 0; //todo ac3flags[j] = 0; //todo
language[j]=std::string(_lang); language[j] = std::string(_lang);
} }
} }
free(TrackList[i]); free(TrackList[i]);
free(TrackList[i+1]); free(TrackList[i + 1]);
} }
free(TrackList); free(TrackList);
*numpida=j; *numpida = j;
} }
} }
} }
@@ -520,30 +538,34 @@ void cPlayback::FindAllTeletextsubtitlePids(int *pids, unsigned int *numpids, st
int max_numpids = *numpids; int max_numpids = *numpids;
*numpids = 0; *numpids = 0;
/* /*
if(player && player->manager && player->manager->teletext) { if (player && player->manager && player->manager->teletext)
char ** TrackList = NULL; {
char **TrackList = NULL;
player->manager->teletext->Command(player, MANAGER_LIST, &TrackList); player->manager->teletext->Command(player, MANAGER_LIST, &TrackList);
if (TrackList != NULL) { if (TrackList != NULL)
{
printf("Teletext List\n"); printf("Teletext List\n");
int i = 0,j=0; int i = 0, j = 0;
for (i = 0,j=0; TrackList[i] != NULL; i+=2) { for (i = 0, j = 0; TrackList[i] != NULL; i += 2)
{
int type = 0; int type = 0;
printf("\t%s - %s\n", TrackList[i], TrackList[i+1]); printf("\t%s - %s\n", TrackList[i], TrackList[i + 1]);
if (j < max_numpids) { if (j < max_numpids)
{
int _pid; int _pid;
if (2 != sscanf(TrackList[i], "%*d %d %*s %d %*d %*d", &_pid, &type)) if (2 != sscanf(TrackList[i], "%d %*s %d %*d %*d", &_pid, &type))
continue; continue;
if (type != 2 && type != 5) // return subtitles only if (type != 2 && type != 5) // return subtitles only
continue; continue;
pids[j]=_pid; pids[j] = _pid;
language[j]=std::string(TrackList[i]); language[j] = std::string(TrackList[i]);
j++; j++;
} }
free(TrackList[i]); free(TrackList[i]);
free(TrackList[i+1]); free(TrackList[i + 1]);
} }
free(TrackList); free(TrackList);
*numpids=j; *numpids = j;
} }
} }
*/ */
@@ -554,23 +576,27 @@ int cPlayback::GetTeletextPid(void)
lt_info("%s\n", __func__); lt_info("%s\n", __func__);
int pid = -1; int pid = -1;
/* /*
if(player && player->manager && player->manager->teletext) { if (player && player->manager && player->manager->teletext)
char ** TrackList = NULL; {
char **TrackList = NULL;
player->manager->teletext->Command(player, MANAGER_LIST, &TrackList); player->manager->teletext->Command(player, MANAGER_LIST, &TrackList);
if (TrackList != NULL) { if (TrackList != NULL)
{
printf("Teletext List\n"); printf("Teletext List\n");
int i = 0; int i = 0;
for (i = 0; TrackList[i] != NULL; i+=2) { for (i = 0; TrackList[i] != NULL; i += 2)
{
int type = 0; int type = 0;
printf("\t%s - %s\n", TrackList[i], TrackList[i+1]); printf("\t%s - %s\n", TrackList[i], TrackList[i+1]);
if (pid < 0) { if (pid < 0)
{
if (2 != sscanf(TrackList[i], "%*d %d %*s %d %*d %*d", &pid, &type)) if (2 != sscanf(TrackList[i], "%*d %d %*s %d %*d %*d", &pid, &type))
continue; continue;
if (type != 1) if (type != 1)
pid = -1; pid = -1;
} }
free(TrackList[i]); free(TrackList[i]);
free(TrackList[i+1]); free(TrackList[i + 1]);
} }
free(TrackList); free(TrackList);
} }
@@ -597,20 +623,23 @@ void cPlayback::GetChapters(std::vector<int> &positions, std::vector<std::string
{ {
positions.clear(); positions.clear();
titles.clear(); titles.clear();
if(player && player->manager && player->manager->chapter) { if (player && player->manager && player->manager->chapter)
char ** TrackList = NULL; {
char **TrackList = NULL;
player->manager->chapter->Command(player, MANAGER_LIST, &TrackList); player->manager->chapter->Command(player, MANAGER_LIST, &TrackList);
if (TrackList != NULL) { if (TrackList != NULL)
{
printf("%s: Chapter List\n", __func__); printf("%s: Chapter List\n", __func__);
int i = 0; int i = 0;
for (i = 0; TrackList[i] != NULL; i+=2) { for (i = 0; TrackList[i] != NULL; i += 2)
printf("\t%s - %s\n", TrackList[i], TrackList[i+1]); {
printf("\t%s - %s\n", TrackList[i], TrackList[i + 1]);
int pos = atoi(TrackList[i]); int pos = atoi(TrackList[i]);
std::string title(TrackList[i + 1]); std::string title(TrackList[i + 1]);
positions.push_back(pos); positions.push_back(pos);
titles.push_back(title); titles.push_back(title);
free(TrackList[i]); free(TrackList[i]);
free(TrackList[i+1]); free(TrackList[i + 1]);
} }
free(TrackList); free(TrackList);
} }
@@ -675,8 +704,9 @@ bool cPlayback::IsPlaying()
uint64_t cPlayback::GetReadCount() uint64_t cPlayback::GetReadCount()
{ {
//if (player && player->playback) { //if (player && player->playback)
//return player->playback->readCount; //{
// return player->playback->readCount;
//} //}
return 0; return 0;
} }

15
libarmbox/playback_libeplayer3.h
View File

@@ -43,18 +43,9 @@ class cPlayback
bool SetVPid(int pid); bool SetVPid(int pid);
bool SetSubtitlePid(int pid); bool SetSubtitlePid(int pid);
bool SetTeletextPid(int pid); bool SetTeletextPid(int pid);
int GetAPid(void) int GetAPid(void) { return mAudioStream; }
{ int GetVPid(void) { return 0; }
return mAudioStream; int GetSubtitlePid(void) { return mSubtitleStream; }
};
int GetVPid(void)
{
return 0;
};
int GetSubtitlePid(void)
{
return mSubtitleStream;
};
int GetTeletextPid(void); int GetTeletextPid(void);
bool SetSpeed(int speed); bool SetSpeed(int speed);
bool GetSpeed(int &speed) const; bool GetSpeed(int &speed) const;