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

libspark/libeplayer: rudimentary subtitle support, probably unstable

Browse Source
This commit is contained in:
martii
2012-11-04 15:39:48 +01:00
parent 2f886cae89
commit aa0681a555
5 changed files with 144 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
libeplayer3/container/container_ass.c
View File

@@ -75,7 +75,11 @@ if (debug_level >= level) printf("[%s:%s] " fmt, __FILE__, __FUNCTION__, ## x);
#define ASS_RING_SIZE 5
#ifdef MARTII
#define ASS_FONT "/share/fonts/neutrino.ttf"
#else
#define ASS_FONT "/usr/share/fonts/FreeSans.ttf"
#endif
/* ***************************** */
/* Types */
@@ -382,14 +386,22 @@ static void ASSThread(Context_t *context) {
continue;
}
#ifndef MARTII
getMutex(__LINE__);
#endif
//FIXME: durch den sleep bleibt die cpu usage zw. 5 und 13%, ohne
// steigt sie bei Verwendung von subtiteln bis auf 95%.
// ich hoffe dadurch gehen keine subtitle verloren, wenn die playPts
// durch den sleep verschlafen wird. Besser w<>re es den n<>chsten
// subtitel zeitpunkt zu bestimmen und solange zu schlafen.
#ifdef MARTII
usleep(10000);
getMutex(__LINE__);
checkRegions();
#else
usleep(1000);
#endif
if(ass_renderer && ass_track)
img = ass_render_frame(ass_renderer, ass_track, playPts / 90.0, &change);
@@ -414,7 +426,11 @@ static void ASSThread(Context_t *context) {
if (ass_track && ass_track->events)
{
#ifdef MARTII
undisplay = now + (ass_track->events->Duration + 500) / 90000;
#else
undisplay = now + ass_track->events->Duration / 1000 + 0.5;
#endif
}
ass_printf(100, "w %d h %d s %d x %d y %d c %d chg %d now %ld und %ld\n",
@@ -531,12 +547,21 @@ static void ASSThread(Context_t *context) {
}
/* cleanup no longer used but not overwritten regions */
#ifdef MARTII
getMutex(__LINE__);
#endif
checkRegions();
#ifdef MARTII
releaseMutex(__LINE__);
#endif
} /* while */
hasPlayThreadStarted = 0;
ass_printf(10, "terminating\n");
#ifdef MARTII
pthread_exit(NULL);
#endif
}
/* **************************** */
@@ -614,10 +639,18 @@ int container_ass_init(Context_t *context)
}
ass_set_use_margins(ass_renderer, 0 );
#ifdef MARTII
ass_set_font_scale(ass_renderer, (ass_font_scale * screen_height) / 240.0);
#else
ass_set_font_scale(ass_renderer, ass_font_scale);
#endif
ass_set_hinting(ass_renderer, ASS_HINTING_LIGHT);
#ifdef MARTII
ass_set_line_spacing(ass_renderer, (ass_line_spacing * screen_height) / 240.0);
#else
ass_set_line_spacing(ass_renderer, ass_line_spacing);
#endif
ass_set_fonts(ass_renderer, ASS_FONT, "Arial", 0, NULL, 1);
if(threeDMode == 0){
@@ -656,6 +689,10 @@ int container_ass_process_data(Context_t *context, SubtitleData_t* data)
ass_err("error creating ass_track\n");
return cERR_CONTAINER_ASS_ERROR;
}
#ifdef MARTII
ass_track->PlayResX = screen_width;
ass_track->PlayResY = screen_height;
#endif
}
if ((data->extradata) && (first_kiss))

3
libeplayer3/include/subtitle.h
View File

@@ -36,6 +36,9 @@ Format: Marked, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
static inline unsigned char* text_to_ass(char *text, long long int pts, double duration)
{
char buf[1024];
#ifdef MARTII
unsigned
#endif
int x,pos=0;
for(x=0;x<strlen(text);x++){
if(text[x]=='\n'){

10
libeplayer3/output/writer/framebuffer.c
View File

@@ -162,6 +162,15 @@ static int writeData(void* _call)
{
k = ((unsigned)src[x]) * opacity / 255;
ck = 255 - k;
#ifdef MARTII // or __sh__, or !HAVE_TRIPLEDRAGON
*dst++ = 0;
t = *dst;
*dst++ = (k*r + ck*t) / 255;
t = *dst;
*dst++ = (k*b + ck*t) / 255;
t = *dst;
*dst++ = (k*g + ck*t) / 255;
#else
t = *dst;
*dst++ = (k*b + ck*t) / 255;
t = *dst;
@@ -169,6 +178,7 @@ static int writeData(void* _call)
t = *dst;
*dst++ = (k*r + ck*t) / 255;
*dst++ = 0;
#endif
}
dst += dst_delta;