mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-09-01 18:01:14 +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 1853f87202
commit 8c577d8e6f
14 changed files with 133 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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;