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

libeplayer3: remove no longer needed teletext output handling

Browse Source 
Origin commit data
------------------
Branch: master
Commit: e08eadd574
Author: martii <m4rtii@gmx.de>
Date: 2014-03-23 (Sun, 23 Mar 2014)


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

------------------
This commit was generated by Migit
This commit is contained in:
martii
2014-03-23 14:46:31 +01:00
parent 7a499f35c4
commit c940dbea59
7 changed files with 39 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libeplayer3/container/container_ffmpeg.c
View File

@@ -807,8 +807,9 @@ int container_ffmpeg_init(Context_t * context, char *filename)
avContext->iformat->flags |= AVFMT_SEEK_TO_PTS; avContext->iformat->flags |= AVFMT_SEEK_TO_PTS;
avContext->flags = AVFMT_FLAG_GENPTS; avContext->flags = AVFMT_FLAG_GENPTS;
if (context->playback->noprobe) { if (context->playback->noprobe) {
ffmpeg_printf(10, "noprobe\n"); ffmpeg_printf(5, "noprobe\n");
avContext->max_analyze_duration = 1; avContext->max_analyze_duration = 1;
avContext->probesize = 8192;
} }
ffmpeg_printf(20, "find_streaminfo\n"); ffmpeg_printf(20, "find_streaminfo\n");

2
libeplayer3/include/output.h
View File

@@ -60,8 +60,6 @@ typedef struct OutputHandler_s {
char *Name; char *Name;
Output_t *audio; Output_t *audio;
Output_t *video; Output_t *video;
Output_t *subtitle;
Output_t *teletext;
int (*Command) ( /*Context_t */ void *, OutputCmd_t, void *); int (*Command) ( /*Context_t */ void *, OutputCmd_t, void *);
} OutputHandler_t; } OutputHandler_t;

1
libeplayer3/include/playback.h
View File

@@ -34,7 +34,6 @@ typedef struct PlaybackHandler_s {
unsigned char isAudio; unsigned char isAudio;
unsigned char isSubtitle; unsigned char isSubtitle;
unsigned char isDvbSubtitle; unsigned char isDvbSubtitle;
unsigned char isTeletext;
unsigned char abortRequested; unsigned char abortRequested;
unsigned char abortPlayback; unsigned char abortPlayback;

8
libeplayer3/manager/teletext.c
View File

@@ -77,7 +77,7 @@ static int CurrentTrack = -1;
/* Functions */ /* Functions */
/* ***************************** */ /* ***************************** */
static int ManagerAdd(Context_t * context, Track_t track) static int ManagerAdd(Context_t * context __attribute__((unused)), Track_t track)
{ {
teletext_mgr_printf(10, "%s::%s name=\"%s\" encoding=\"%s\" id=%d\n", teletext_mgr_printf(10, "%s::%s name=\"%s\" encoding=\"%s\" id=%d\n",
@@ -113,9 +113,6 @@ static int ManagerAdd(Context_t * context, Track_t track)
return cERR_TELETEXT_MGR_ERROR; return cERR_TELETEXT_MGR_ERROR;
} }
if (TrackCount > 0)
context->playback->isTeletext = 1;
teletext_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__); teletext_mgr_printf(10, "%s::%s\n", FILENAME, __FUNCTION__);
return cERR_TELETEXT_MGR_NO_ERROR; return cERR_TELETEXT_MGR_NO_ERROR;
@@ -156,7 +153,7 @@ static char **ManagerList(Context_t * context __attribute__ ((unused)))
return tracklist; return tracklist;
} }
static int ManagerDel(Context_t * context) static int ManagerDel(Context_t * context __attribute__((unused)))
{ {
int i = 0; int i = 0;
@@ -177,7 +174,6 @@ static int ManagerDel(Context_t * context)
TrackCount = 0; TrackCount = 0;
CurrentTrack = -1; CurrentTrack = -1;
context->playback->isTeletext = 0;
teletext_mgr_printf(10, "%s::%s return no error\n", FILENAME, teletext_mgr_printf(10, "%s::%s return no error\n", FILENAME,
__FUNCTION__); __FUNCTION__);

189
libeplayer3/output/output.c
View File

@@ -124,8 +124,6 @@ static void OutputDel(Context_t * context, char *port)
context->output->audio = NULL; context->output->audio = NULL;
else if (!strcmp("video", port)) else if (!strcmp("video", port))
context->output->video = NULL; context->output->video = NULL;
else if (!strcmp("teletext", port))
context->output->teletext = NULL;
} }
@@ -141,20 +139,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
case OUTPUT_OPEN:{ case OUTPUT_OPEN:{
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo) if (context->playback->isVideo)
ret |= ret |= context->output->video->Command(context, OUTPUT_OPEN, "video");
context->output->video->Command(context,
OUTPUT_OPEN,
"video");
if (context->playback->isAudio) if (context->playback->isAudio)
ret |= ret |= context->output->audio->Command(context, OUTPUT_OPEN, "audio");
context->output->audio->Command(context,
OUTPUT_OPEN,
"audio");
if (context->playback->isTeletext)
ret |=
context->output->teletext->Command(context,
command,
"teletext");
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -162,20 +149,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
case OUTPUT_CLOSE:{ case OUTPUT_CLOSE:{
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo) if (context->playback->isVideo)
ret |= ret |= context->output->video->Command(context, OUTPUT_CLOSE, "video");
context->output->video->Command(context,
OUTPUT_CLOSE,
"video");
if (context->playback->isAudio) if (context->playback->isAudio)
ret |= ret |= context->output->audio->Command(context, OUTPUT_CLOSE, "audio");
context->output->audio->Command(context,
OUTPUT_CLOSE,
"audio");
if (context->playback->isTeletext)
ret |=
context->output->teletext->Command(context,
command,
"teletext");
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -195,23 +171,11 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
case OUTPUT_PLAY:{ // 4 case OUTPUT_PLAY:{ // 4
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo) if (context->playback->isVideo)
ret = ret = context->output->video->Command(context, OUTPUT_PLAY, "video");
context->output->video->Command(context,
OUTPUT_PLAY,
"video");
if (!ret) { // success or not executed, dunn care if (!ret) { // success or not executed, dunn care
if (context->playback->isAudio) if (context->playback->isAudio)
ret = ret = context->output->audio->Command(context, OUTPUT_PLAY, "audio");
context->output->audio->Command(context,
OUTPUT_PLAY,
"audio");
if (context->playback->isTeletext)
ret |=
context->output->teletext->Command(context,
command,
"teletext");
} }
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
@@ -221,19 +185,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo) if (context->playback->isVideo)
ret |= ret |=
context->output->video->Command(context, context->output->video->Command(context, OUTPUT_STOP, "video");
OUTPUT_STOP,
"video");
if (context->playback->isAudio) if (context->playback->isAudio)
ret |= ret |= context->output->audio->Command(context, OUTPUT_STOP, "audio");
context->output->audio->Command(context,
OUTPUT_STOP,
"audio");
if (context->playback->isTeletext)
ret |=
context->output->teletext->Command(context,
command,
"teletext");
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -241,15 +195,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
case OUTPUT_FLUSH:{ case OUTPUT_FLUSH:{
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo) if (context->playback->isVideo)
ret |= ret |= context->output->video->Command(context, OUTPUT_FLUSH, "video");
context->output->video->Command(context,
OUTPUT_FLUSH,
"video");
if (context->playback->isAudio) if (context->playback->isAudio)
ret |= ret |= context->output->audio->Command(context, OUTPUT_FLUSH, "audio");
context->output->audio->Command(context,
OUTPUT_FLUSH,
"audio");
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -257,15 +205,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
case OUTPUT_PAUSE:{ case OUTPUT_PAUSE:{
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo) if (context->playback->isVideo)
ret |= ret |= context->output->video->Command(context, OUTPUT_PAUSE, "video");
context->output->video->Command(context,
OUTPUT_PAUSE,
"video");
if (context->playback->isAudio) if (context->playback->isAudio)
ret |= ret |= context->output->audio->Command(context, OUTPUT_PAUSE, "audio");
context->output->audio->Command(context,
OUTPUT_PAUSE,
"audio");
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -273,15 +215,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
case OUTPUT_FASTFORWARD:{ case OUTPUT_FASTFORWARD:{
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo) if (context->playback->isVideo)
ret |= ret |= context->output->video->Command(context, OUTPUT_FASTFORWARD, "video");
context->output->video->Command(context,
OUTPUT_FASTFORWARD,
"video");
if (context->playback->isAudio) if (context->playback->isAudio)
ret |= ret |= context->output->audio->Command(context, OUTPUT_FASTFORWARD, "audio");
context->output->audio->Command(context,
OUTPUT_FASTFORWARD,
"audio");
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -289,15 +225,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
case OUTPUT_REVERSE:{ case OUTPUT_REVERSE:{
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo) if (context->playback->isVideo)
ret |= ret |= context->output->video->Command(context, OUTPUT_REVERSE, "video");
context->output->video->Command(context,
OUTPUT_REVERSE,
"video");
if (context->playback->isAudio) if (context->playback->isAudio)
ret |= ret |= context->output->audio->Command(context, OUTPUT_REVERSE, "audio");
context->output->audio->Command(context,
OUTPUT_REVERSE,
"audio");
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -305,32 +235,17 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
case OUTPUT_CONTINUE:{ case OUTPUT_CONTINUE:{
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo) if (context->playback->isVideo)
ret |= ret |= context->output->video->Command(context, OUTPUT_CONTINUE, "video");
context->output->video->Command(context,
OUTPUT_CONTINUE,
"video");
if (context->playback->isAudio) if (context->playback->isAudio)
ret |= ret |= context->output->audio->Command(context, OUTPUT_CONTINUE, "audio");
context->output->audio->Command(context,
OUTPUT_CONTINUE,
"audio");
if (context->playback->isTeletext)
ret |=
context->output->teletext->Command(context,
command,
"teletext");
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
} }
case OUTPUT_AVSYNC:{ case OUTPUT_AVSYNC:{
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo if (context->playback->isVideo && context->playback->isAudio)
&& context->playback->isAudio) ret |= context->output->audio->Command(context, OUTPUT_AVSYNC, "audio");
ret |=
context->output->audio->Command(context,
OUTPUT_AVSYNC,
"audio");
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -339,21 +254,10 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo if (context->playback->isVideo
&& (argument == NULL || *(char *) argument == 'v')) && (argument == NULL || *(char *) argument == 'v'))
ret |= ret |= context->output->video->Command(context, OUTPUT_CLEAR, "video");
context->output->video->Command(context,
OUTPUT_CLEAR,
"video");
if (context->playback->isAudio if (context->playback->isAudio
&& (argument == NULL || *(char *) argument == 'a')) && (argument == NULL || *(char *) argument == 'a'))
ret |= ret |= context->output->audio->Command(context, OUTPUT_CLEAR, "audio");
context->output->audio->Command(context,
OUTPUT_CLEAR,
"audio");
if (context->playback->isTeletext)
ret |=
context->output->teletext->Command(context,
command,
"teletext");
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -361,13 +265,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
case OUTPUT_PTS:{ case OUTPUT_PTS:{
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo) if (context->playback->isVideo)
return context->output->video->Command(context, return context->output->video->Command(context, OUTPUT_PTS, argument);
OUTPUT_PTS,
argument);
if (context->playback->isAudio) if (context->playback->isAudio)
return context->output->audio->Command(context, return context->output->audio->Command(context, OUTPUT_PTS, argument);
OUTPUT_PTS,
argument);
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -375,18 +275,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
case OUTPUT_SWITCH:{ case OUTPUT_SWITCH:{
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isAudio) if (context->playback->isAudio)
return context->output->audio->Command(context, return context->output->audio->Command(context, OUTPUT_SWITCH, "audio");
OUTPUT_SWITCH,
"audio");
if (context->playback->isVideo) if (context->playback->isVideo)
return context->output->video->Command(context, return context->output->video->Command(context, OUTPUT_SWITCH, "video");
OUTPUT_SWITCH,
"video");
if (context->playback->isTeletext)
ret |=
context->output->teletext->Command(context,
command,
"teletext");
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -395,14 +286,10 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo) if (context->playback->isVideo)
ret |= ret |=
context->output->video->Command(context, context->output->video->Command(context, OUTPUT_SLOWMOTION, "video");
OUTPUT_SLOWMOTION,
"video");
if (context->playback->isAudio) if (context->playback->isAudio)
ret |= ret |=
context->output->audio->Command(context, context->output->audio->Command(context, OUTPUT_SLOWMOTION, "audio");
OUTPUT_SLOWMOTION,
"audio");
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -410,10 +297,7 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
case OUTPUT_AUDIOMUTE:{ case OUTPUT_AUDIOMUTE:{
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isAudio) if (context->playback->isAudio)
ret |= ret |= context->output->audio->Command(context, OUTPUT_AUDIOMUTE, (char *) argument);
context->output->audio->Command(context,
OUTPUT_AUDIOMUTE,
(char *) argument);
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -421,10 +305,7 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
case OUTPUT_DISCONTINUITY_REVERSE:{ case OUTPUT_DISCONTINUITY_REVERSE:{
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo) if (context->playback->isVideo)
ret |= ret |= context->output->video->Command(context, OUTPUT_DISCONTINUITY_REVERSE, (void *) argument);
context->output->video->Command(context,
OUTPUT_DISCONTINUITY_REVERSE,
(void *) argument);
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -432,13 +313,9 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
case OUTPUT_GET_FRAME_COUNT:{ case OUTPUT_GET_FRAME_COUNT:{
if (context && context->playback) { if (context && context->playback) {
if (context->playback->isVideo) if (context->playback->isVideo)
return context->output->video->Command(context, return context->output->video->Command(context, OUTPUT_GET_FRAME_COUNT, argument);
OUTPUT_GET_FRAME_COUNT,
argument);
if (context->playback->isAudio) if (context->playback->isAudio)
return context->output->audio->Command(context, return context->output->audio->Command(context, OUTPUT_GET_FRAME_COUNT, argument);
OUTPUT_GET_FRAME_COUNT,
argument);
} else } else
ret = cERR_OUTPUT_INTERNAL_ERROR; ret = cERR_OUTPUT_INTERNAL_ERROR;
break; break;
@@ -460,7 +337,5 @@ OutputHandler_t OutputHandler = {
"Output", "Output",
NULL, NULL,
NULL, NULL,
NULL,
NULL, // teletext
&Command &Command
}; };

1
libeplayer3/playback/playback.c
View File

@@ -870,7 +870,6 @@ PlaybackHandler_t PlaybackHandler = {
0, 0,
0, 0,
0, 0,
0,
&Command, &Command,
"", "",
0, 0,

6
libspark/playback_libeplayer3.cpp
View File

@@ -92,8 +92,8 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, un
bool ret = false; bool ret = false;
bool isHTTP = false; bool isHTTP = false;
printf("%s:%s - filename=%s vpid=%u vtype=%d apid=%u ac3=%d\n", printf("%s:%s - filename=%s vpid=%u vtype=%d apid=%u ac3=%d, no_probe=%d\n",
FILENAME, __FUNCTION__, filename, vpid, vtype, apid, ac3); FILENAME, __FUNCTION__, filename, vpid, vtype, apid, ac3, no_probe);
init_jump = -1; init_jump = -1;
//create playback path //create playback path
@@ -108,7 +108,7 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, un
if(strstr(filename, "://")) if(strstr(filename, "://"))
isHTTP = true; isHTTP = true;
else if (pm == PLAYMODE_TS && no_probe) else if (no_probe)
strcat(file, "myts://"); strcat(file, "myts://");
else else
strcat(file, "file://"); strcat(file, "file://");