mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 23:43:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

libeplayer3: subtitles will now be displayed by neutrino

Browse Source
This commit is contained in:
martii
2014-03-21 20:15:01 +01:00
parent f60e040d03
commit cd7c6086d2
10 changed files with 128 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
libeplayer3/output/output.c
View File

@@ -65,7 +65,6 @@ static const char *FILENAME = "output.c";
static Output_t *AvailableOutput[] = {
&LinuxDvbOutput,
&SubtitleOutput,
&PipeOutput,
NULL
};
@@ -115,10 +114,6 @@ static void OutputAdd(Context_t * context, char *port)
context->output->video = AvailableOutput[i];
return;
}
if (!strcmp("subtitle", port)) {
context->output->subtitle = AvailableOutput[i];
return;
}
if (!strcmp("teletext", port)) {
context->output->teletext = AvailableOutput[i];
return;
@@ -134,8 +129,6 @@ static void OutputDel(Context_t * context, char *port)
context->output->audio = NULL;
else if (!strcmp("video", port))
context->output->video = NULL;
else if (!strcmp("subtitle", port))
context->output->subtitle = NULL;
else if (!strcmp("teletext", port))
context->output->teletext = NULL;
@@ -162,11 +155,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
context->output->audio->Command(context,
OUTPUT_OPEN,
"audio");
if (context->playback->isSubtitle)
ret |=
context->output->subtitle->Command(context,
OUTPUT_OPEN,
"subtitle");
if (context->playback->isTeletext)
ret |=
context->output->teletext->Command(context,
@@ -188,11 +176,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
context->output->audio->Command(context,
OUTPUT_CLOSE,
"audio");
if (context->playback->isSubtitle)
ret |=
context->output->subtitle->Command(context,
OUTPUT_CLOSE,
"subtitle");
if (context->playback->isTeletext)
ret |=
context->output->teletext->Command(context,
@@ -229,13 +212,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
OUTPUT_PLAY,
"audio");
if (!ret) { // success or not executed, dunn care
if (context->playback->isSubtitle)
ret =
context->output->subtitle->Command(context,
OUTPUT_PLAY,
"subtitle");
}
if (context->playback->isTeletext)
ret |=
context->output->teletext->Command(context,
@@ -258,11 +234,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
context->output->audio->Command(context,
OUTPUT_STOP,
"audio");
if (context->playback->isSubtitle)
ret |=
context->output->subtitle->Command(context,
OUTPUT_STOP,
"subtitle");
if (context->playback->isTeletext)
ret |=
context->output->teletext->Command(context,
@@ -284,8 +255,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
context->output->audio->Command(context,
OUTPUT_FLUSH,
"audio");
//if (context->playback->isSubtitle)
// ret |= context->output->subtitle->Command(context, OUTPUT_FLUSH, "subtitle");
} else
ret = cERR_OUTPUT_INTERNAL_ERROR;
break;
@@ -302,8 +271,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
context->output->audio->Command(context,
OUTPUT_PAUSE,
"audio");
//if (context->playback->isSubtitle)
// ret |= context->output->subtitle->Command(context, OUTPUT_PAUSE, "subtitle");
} else
ret = cERR_OUTPUT_INTERNAL_ERROR;
break;
@@ -320,8 +287,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
context->output->audio->Command(context,
OUTPUT_FASTFORWARD,
"audio");
//if (context->playback->isSubtitle)
// ret |= context->output->subtitle->Command(context, OUTPUT_PAUSE, "subtitle");
} else
ret = cERR_OUTPUT_INTERNAL_ERROR;
break;
@@ -354,8 +319,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
context->output->audio->Command(context,
OUTPUT_CONTINUE,
"audio");
//if (context->playback->isSubtitle)
// ret |= context->output->subtitle->Command(context, OUTPUT_CONTINUE, "subtitle");
if (context->playback->isTeletext)
ret |=
context->output->teletext->Command(context,
@@ -391,8 +354,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
context->output->audio->Command(context,
OUTPUT_CLEAR,
"audio");
//if (context->playback->isSubtitle && (argument == NULL || *(char *) argument == 's'))
// ret |= context->output->subtitle->Command(context, OUTPUT_CLEAR, "subtitle");
if (context->playback->isTeletext)
ret |=
context->output->teletext->Command(context,
@@ -412,8 +373,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
return context->output->audio->Command(context,
OUTPUT_PTS,
argument);
//if (context->playback->isSubtitle)
// return context->output->subtitle->Command(context, OUTPUT_PTS, "subtitle");
} else
ret = cERR_OUTPUT_INTERNAL_ERROR;
break;
@@ -449,8 +408,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
context->output->audio->Command(context,
OUTPUT_SLOWMOTION,
"audio");
//if (context->playback->isSubtitle)
// ret |= context->output->subtitle->Command(context, OUTPUT_PAUSE, "subtitle");
} else
ret = cERR_OUTPUT_INTERNAL_ERROR;
break;
@@ -487,8 +444,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
return context->output->audio->Command(context,
OUTPUT_GET_FRAME_COUNT,
argument);
//if (context->playback->isSubtitle)
// return context->output->subtitle->Command(context, OUTPUT_GET_FRAME_COUNT, "subtitle");
} else
ret = cERR_OUTPUT_INTERNAL_ERROR;
break;

23
libeplayer3/output/output_subtitle.c
View File

@@ -105,12 +105,10 @@ static int readPointer = 0;
static int writePointer = 0;
static int hasThreadStarted = 0;
static int isSubtitleOpened = 0;
static int screen_width = 0;
static int screen_height = 0;
static int destStride = 0;
static void (*framebufferBlit) = NULL;
static uint32_t *destination = NULL;
void (*dvbsubWrite)(AVSubtitle *, int64_t) = NULL;
void (*dvbsubAssWrite)(AVCodecContext *, AVSubtitle *, int) = NULL;
void (*dvbsubAssClear)(void) = NULL;
/* ***************************** */
/* Prototypes */
@@ -784,22 +782,16 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
}
case OUTPUT_GET_SUBTITLE_OUTPUT:{
SubtitleOutputDef_t *out = (SubtitleOutputDef_t *) argument;
out->screen_width = screen_width;
out->screen_height = screen_height;
out->framebufferBlit = framebufferBlit;
out->dvbsubWrite = (void (*)(void *, int64_t))dvbsubWrite;
out->destination = destination;
out->destStride = destStride;
out->dvbsubAssWrite = (void (*)(void *, void *, int))dvbsubAssWrite;
out->dvbsubAssClear = (void (*)(void))dvbsubAssClear;
break;
}
case OUTPUT_SET_SUBTITLE_OUTPUT:{
SubtitleOutputDef_t *out = (SubtitleOutputDef_t *) argument;
screen_width = out->screen_width;
screen_height = out->screen_height;
framebufferBlit = out->framebufferBlit;
dvbsubWrite = (void (*)(AVSubtitle *, int64_t))out->dvbsubWrite;
destination = out->destination;
destStride = out->destStride;
dvbsubAssWrite = (void (*)(AVCodecContext *, AVSubtitle *, int))out->dvbsubAssWrite;
dvbsubAssClear = (void (*)(void))out->dvbsubAssClear;
break;
}
case OUTPUT_SUBTITLE_REGISTER_FUNCTION:{
@@ -825,7 +817,6 @@ static int Command(void *_context, OutputCmd_t command, void *argument)
ret = cERR_SUBTITLE_ERROR;
break;
}
default:
subtitle_err("OutputCmd %d not supported!\n", command);
ret = cERR_SUBTITLE_ERROR;

1
libeplayer3/output/writer/writer.c
View File

@@ -81,7 +81,6 @@ static Writer_t *AvailableWriter[] = {
&WriterVideoH263,
&WriterVideoFLV,
&WriterVideoVC1,
&WriterFramebuffer,
NULL
};