diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | include/xine.h.tmpl.in | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/demuxers/demux_avi.c | 28 | ||||
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 4 | ||||
| -rw-r--r-- | src/input/input_file.c | 53 | ||||
| -rw-r--r-- | src/input/input_plugin.h | 7 | ||||
| -rwxr-xr-x | src/libmad/layer3.c | 4 | ||||
| -rw-r--r-- | src/libspudec/xine_decoder.c | 4 | ||||
| -rw-r--r-- | src/libsputext/Makefile.am | 47 | ||||
| -rw-r--r-- | src/libsputext/xine_decoder.c | 914 | ||||
| -rw-r--r-- | src/xine-engine/buffer.h | 3 | ||||
| -rw-r--r-- | src/xine-engine/configfile.c | 27 | ||||
| -rw-r--r-- | src/xine-engine/configfile.h | 8 | ||||
| -rw-r--r-- | src/xine-engine/video_decoder.c | 3 |
16 files changed, 1063 insertions, 53 deletions
@@ -1,10 +1,14 @@ +xine (0.9.7) unstable; urgency=low * fix some win32 dll segfaults * seamless branching on input_dvd * fix no audio deadlock * OSD (On Screen Display) for rendering text and graphics into overlays * reworked spu and overlay manager (multiple overlays supported) - + * support for avi text subtitles (use something like xine stream.avi:foo.sub) + + -- Guenter Bartsch <guenter@users.sourceforge.net> Tue Nov 27 01:20:06 CET 2001 + xine (0.9.6) unstable; urgency=low * demux_asf big fragments handling diff --git a/configure.in b/configure.in index 734801867..49dfac1cb 100644 --- a/configure.in +++ b/configure.in @@ -757,6 +757,7 @@ src/libw32dll/Makefile src/libw32dll/wine/Makefile src/libw32dll/DirectShow/Makefile src/libspudec/Makefile +src/libsputext/Makefile src/libvfill/Makefile src/libvorbis/Makefile src/libdivx4/Makefile diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in index 22c8600c8..d558cb562 100644 --- a/include/xine.h.tmpl.in +++ b/include/xine.h.tmpl.in @@ -28,7 +28,7 @@ \endverbatim */ /* - * $Id: xine.h.tmpl.in,v 1.58 2001/11/30 21:55:05 f1rmb Exp $ + * $Id: xine.h.tmpl.in,v 1.59 2001/12/01 22:38:31 guenter Exp $ * */ @@ -546,9 +546,6 @@ struct config_values_s { * from the config file otherwise */ - void (*register_empty) (config_values_t *self, - char *key); - char* (*register_string) (config_values_t *self, char *key, char *def_value, diff --git a/src/Makefile.am b/src/Makefile.am index c1860a489..b8bec5984 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = xine-utils xine-engine audio_out video_out dxr3 input libmpeg2 libspudec demuxers \ liba52 libffmpeg liblpcm libw32dll libmad libdts libvfill \ - libvorbis libdivx4 + libvorbis libdivx4 libsputext debug: @list='$(SUBDIRS)'; for subdir in $$list; do \ diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 0013fef61..781a45df7 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_avi.c,v 1.54 2001/11/30 00:53:51 f1rmb Exp $ + * $Id: demux_avi.c,v 1.55 2001/12/01 22:38:31 guenter Exp $ * * demultiplexer for avi streams * @@ -866,10 +866,11 @@ static void demux_avi_start (demux_plugin_t *this_gen, fifo_buffer_t *video_fifo, fifo_buffer_t *audio_fifo, off_t start_pos, int start_time) { - buf_element_t *buf; - demux_avi_t *this = (demux_avi_t *) this_gen; - uint32_t video_pts = 0; - int err; + buf_element_t *buf; + demux_avi_t *this = (demux_avi_t *) this_gen; + uint32_t video_pts = 0; + int err; + unsigned char *sub; this->audio_fifo = audio_fifo; this->video_fifo = video_fifo; @@ -993,6 +994,23 @@ static void demux_avi_start (demux_plugin_t *this_gen, this->audio_fifo->put (this->audio_fifo, buf); } + /* + * send external spu file pointer, if present + */ + + if (this->input->get_optional_data (this->input, &sub, INPUT_OPTIONAL_DATA_TEXTSPU0)) { + + buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); + buf->content = sub; + + buf->type = BUF_SPU_TEXT; + + this->video_fifo->put (this->video_fifo, buf); + + printf ("demux_avi: text subtitle file available\n"); + + } + if ((err = pthread_create (&this->thread, NULL, demux_avi_loop, this)) != 0) { fprintf (stderr, "demux_avi: can't create new thread (%s)\n", strerror(err)); diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 154c33464..81b17d775 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_mpeg_block.c,v 1.66 2001/11/30 21:55:05 f1rmb Exp $ + * $Id: demux_mpeg_block.c,v 1.67 2001/12/01 22:38:31 guenter Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -104,7 +104,7 @@ static void demux_mpeg_block_parse_pack (demux_mpeg_block_t *this, int preview_m printf ("demux_mpeg_block: checking if we can branch to %s\n", next_mrl); - if (this->input->is_branch_possible + if (next_mrl && this->input->is_branch_possible && this->input->is_branch_possible (this->input, next_mrl)) { printf ("demux_mpeg_block: branching\n"); diff --git a/src/input/input_file.c b/src/input/input_file.c index 771108769..a05412ea1 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_file.c,v 1.30 2001/11/30 00:53:51 f1rmb Exp $ + * $Id: input_file.c,v 1.31 2001/12/01 22:38:31 guenter Exp $ */ #ifdef HAVE_CONFIG_H @@ -77,6 +77,7 @@ typedef struct { input_plugin_t input_plugin; int fh; + FILE *sub; char *mrl; config_values_t *config; @@ -234,6 +235,7 @@ static off_t get_file_size(char *filepathname, char *origin) { * */ static uint32_t file_plugin_get_capabilities (input_plugin_t *this_gen) { + return INPUT_CAP_SEEKABLE | INPUT_CAP_GET_DIR; } @@ -242,15 +244,29 @@ static uint32_t file_plugin_get_capabilities (input_plugin_t *this_gen) { */ static int file_plugin_open (input_plugin_t *this_gen, char *mrl) { - char *filename; + char *filename, *subtitle; file_input_plugin_t *this = (file_input_plugin_t *) this_gen; - this->mrl = mrl; + this->mrl = strdup(mrl); /* FIXME: small memory leak */ - if (!strncasecmp (mrl, "file:",5)) - filename = &mrl[5]; + if (!strncasecmp (this->mrl, "file:",5)) + filename = &this->mrl[5]; else - filename = mrl; + filename = this->mrl; + + subtitle = strrchr (filename, ':'); + if (subtitle) { + *subtitle = 0; + subtitle++; + + printf ("input_file: trying to open subtitle file '%s'\n", + subtitle); + + this->sub = fopen (subtitle, "r"); + + } else + this->sub = NULL; + this->fh = open (filename, O_RDONLY); @@ -689,6 +705,11 @@ static void file_plugin_close (input_plugin_t *this_gen) { close(this->fh); this->fh = -1; + + if (this->sub) { + fclose (this->sub); + this->sub = NULL; + } } /* @@ -719,6 +740,25 @@ static char *file_plugin_get_identifier (input_plugin_t *this_gen) { static int file_plugin_get_optional_data (input_plugin_t *this_gen, void *data, int data_type) { + file_input_plugin_t *this = (file_input_plugin_t *) this_gen; + + printf ("input_file: get optional data, type %08x, sub %d\n", + data_type, this->sub); + + + if ( (data_type == INPUT_OPTIONAL_DATA_TEXTSPU0) + && this->sub ) { + + FILE **tmp; + + /* dirty hacks... */ + + tmp = data; + *tmp = this->sub; + + return INPUT_OPTIONAL_SUCCESS; + } + return INPUT_OPTIONAL_UNSUPPORTED; } @@ -763,6 +803,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) { this->input_plugin.is_branch_possible = NULL; this->fh = -1; + this->sub = NULL; this->mrl = NULL; this->config = config; diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h index f14edf5ab..a820a6186 100644 --- a/src/input/input_plugin.h +++ b/src/input/input_plugin.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 the xine project + * Copyright (C) 2000, 2001 the xine project * * This file is part of xine, a unix video player. * @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_plugin.h,v 1.17 2001/11/30 21:55:05 f1rmb Exp $ + * $Id: input_plugin.h,v 1.18 2001/12/01 22:38:31 guenter Exp $ */ #ifndef HAVE_INPUT_PLUGIN_H @@ -334,6 +334,9 @@ struct input_plugin_s #define INPUT_OPTIONAL_DATA_CLUT 1 #define INPUT_OPTIONAL_DATA_AUDIOLANG 2 #define INPUT_OPTIONAL_DATA_SPULANG 3 +#define INPUT_OPTIONAL_DATA_TEXTSPU0 4 +#define INPUT_OPTIONAL_DATA_TEXTSPU1 5 +#define INPUT_OPTIONAL_DATA_TEXTSPU2 6 /* * each input plugin _must_ implement this function: diff --git a/src/libmad/layer3.c b/src/libmad/layer3.c index d19a6f8d3..386fd1c68 100755 --- a/src/libmad/layer3.c +++ b/src/libmad/layer3.c @@ -16,7 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: layer3.c,v 1.1 2001/08/12 02:57:55 guenter Exp $ + * $Id: layer3.c,v 1.2 2001/12/01 22:38:31 guenter Exp $ */ # ifdef HAVE_CONFIG_H @@ -891,7 +891,7 @@ mad_fixed_t III_requantize(unsigned int value, signed int exp) if (exp >= 5) { /* overflow */ # if defined(DEBUG) - fprintf(stderr, "requantize overflow (%f * 2^%d)\n", + printf ("mad: requantize overflow (%f * 2^%d)\n", mad_f_todouble(requantized), exp); # endif requantized = MAD_F_MAX; diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c index 25d80f7b3..3f7e24f16 100644 --- a/src/libspudec/xine_decoder.c +++ b/src/libspudec/xine_decoder.c @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.42 2001/11/30 20:35:48 jcdutton Exp $ + * $Id: xine_decoder.c,v 1.43 2001/12/01 22:38:31 guenter Exp $ * * stuff needed to turn libspu into a xine decoder plugin */ @@ -39,7 +39,9 @@ #include "xineutils.h" #include "spu.h" +/* #define LOG_DEBUG 1 +*/ static clut_t __default_clut[] = { CLUT_Y_CR_CB_INIT(0x00, 0x80, 0x80), diff --git a/src/libsputext/Makefile.am b/src/libsputext/Makefile.am new file mode 100644 index 000000000..ed8c29e9b --- /dev/null +++ b/src/libsputext/Makefile.am @@ -0,0 +1,47 @@ +CFLAGS = @GLOBAL_CFLAGS@ + +LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic + +libdir = $(XINE_PLUGINDIR) + +lib_LTLIBRARIES = xineplug_decode_sputext.la + +xineplug_decode_sputext_la_SOURCES = xine_decoder.c +xineplug_decode_sputext_la_LDFLAGS = -avoid-version -module + +## +## Install header files (default=$includedir/xine) +## +install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(includedir)/xine + @list='$(include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ + done + + +## +## Remove them +## +uninstall-includeHEADERS: + @$(NORMAL_UNINSTALL) + list='$(include_HEADERS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(includedir)/xine/$$p; \ + done + + +debug: + @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" + +install-debug: debug + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +mostlyclean-generic: + -rm -f *~ \#* .*~ .\#* + +maintainer-clean-generic: + -@echo "This command is intended for maintainers to use;" + -@echo "it deletes files that may require special tools to rebuild." + -rm -f Makefile.in diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c new file mode 100644 index 000000000..73e8b7770 --- /dev/null +++ b/src/libsputext/xine_decoder.c @@ -0,0 +1,914 @@ +/* + * Copyright (C) 2000-2001 the xine project + * + * This file is part of xine, a unix video player. + * + * xine is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * xine is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * + * $Id: xine_decoder.c,v 1.1 2001/12/01 22:38:32 guenter Exp $ + * + * code based on mplayer module: + * + * Subtitle reader with format autodetection + * + * Written by laaz + * Some code cleanup & realloc() by A'rpi/ESP-team + * dunnowhat sub format by szabi + */ + +#include <stdlib.h> +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <ctype.h> + +#include "buffer.h" +#include "events.h" +#include "xine_internal.h" +#include "xineutils.h" +#include "osd.h" + +/* +#define LOG_DEBUG 1 +*/ + +#define ERR (void *)-1 + +#define SUB_MAX_TEXT 5 + +typedef struct { + + int lines; + + unsigned long start; + unsigned long end; + + char *text[SUB_MAX_TEXT]; + + osd_object_t *osd; + +} subtitle_t; + + +typedef struct sputext_decoder_s { + spu_decoder_t spu_decoder; + + xine_t *xine; + + vo_instance_t *vo_out; + int output_open; + + FILE *fd; + + float mpsub_position; + + int uses_time; + int errs; + subtitle_t *subtitles; + int num; /* number of subtitle structs */ + int format; /* constants see below */ + subtitle_t *previous_aqt_sub ; + + osd_object_t *osd; + + /* thread */ + int running; + pthread_t spu_thread; + +} sputext_decoder_t; + +#define FORMAT_MICRODVD 0 +#define FORMAT_SUBRIP 1 +#define FORMAT_SUBVIEWER 2 +#define FORMAT_SAMI 3 +#define FORMAT_VPLAYER 4 +#define FORMAT_RT 5 +#define FORMAT_SSA 6 /* Sub Station Alpha */ +#define FORMAT_DUNNO 7 /*... erm ... dunnowhat. tell me if you know */ +#define FORMAT_MPSUB 8 +#define FORMAT_AQTITLE 9 + +static int eol(char p) { + return (p=='\r' || p=='\n' || p=='\0'); +} + +static inline void trail_space(char *s) { + int i; + while (isspace(*s)) + strcpy(s, s + 1); + i = strlen(s) - 1; + while (i > 0 && isspace(s[i])) + s[i--] = '\0'; +} + + +static subtitle_t *sub_read_line_sami(sputext_decoder_t *this, subtitle_t *current) { + + static char line[1001]; + static char *s = NULL; + char text[1000], *p, *q; + int state; + + p = NULL; + current->lines = current->start = current->end = 0; + state = 0; + + /* read the first line */ + if (!s) + if (!(s = fgets(line, 1000, this->fd))) return 0; + + do { + switch (state) { + + case 0: /* find "START=" */ + s = strstr (s, "Start="); + if (s) { + current->start = strtol (s + 6, &s, 0) / 10; + state = 1; continue; + } + break; + + case 1: /* find "<P" */ + if ((s = strstr (s, "<P"))) { s += 2; state = 2; continue; } + break; + + case 2: /* find ">" */ + if ((s = strchr (s, '>'))) { s++; state = 3; p = text; continue; } + break; + + case 3: /* get all text until '<' appears */ + if (*s == '\0') { break; } + else if (*s == '<') { state = 4; } + else if (!strncasecmp (s, " ", 6)) { *p++ = ' '; s += 6; } + else if (*s == '\r') { s++; } + else if (!strncasecmp (s, "<br>", 4) || *s == '\n') { + *p = '\0'; p = text; trail_space (text); + if (text[0] != '\0') + current->text[current->lines++] = strdup (text); + if (*s == '\n') s++; else s += 4; + } + else *p++ = *s++; + continue; + + case 4: /* get current->end or skip <TAG> */ + q = strstr (s, "Start="); + if (q) { + current->end = strtol (q + 6, &q, 0) / 10 - 1; + *p = '\0'; trail_space (text); + if (text[0] != '\0') + current->text[current->lines++] = strdup (text); + if (current->lines > 0) { state = 99; break; } + state = 0; continue; + } + s = strchr (s, '>'); + if (s) { s++; state = 3; continue; } + break; + } + + /* read next line */ + if (state != 99 && !(s = fgets (line, 1000, this->fd))) + return 0; + + } while (state != 99); + + return current; +} + + +static char *sub_readtext(char *source, char **dest) { + int len=0; + char *p=source; + + while ( !eol(*p) && *p!= '|' ) { + p++,len++; + } + + *dest= (char *)xine_xmalloc (len+1); + if (!dest) + return ERR; + + strncpy(*dest, source, len); + (*dest)[len]=0; + + while (*p=='\r' || *p=='\n' || *p=='|') + p++; + + if (*p) return p; /* not-last text field */ + else return NULL; /* last text field */ +} + +static subtitle_t *sub_read_line_microdvd(sputext_decoder_t *this, subtitle_t *current) { + + char line[1001]; + char line2[1001]; + char *p, *next; + int i; + + bzero (current, sizeof(subtitle_t)); + + do { + if (!fgets (line, 1000, this->fd)) return NULL; + } while (sscanf (line, "{%ld}{%ld}%[^\r\n]", &(current->start), &(current->end),line2) <3); + + p=line2; + + next=p, i=0; + while ((next =sub_readtext (next, &(current->text[i])))) { + if (current->text[i]==ERR) return ERR; + i++; + if (i>=SUB_MAX_TEXT) { + printf ("Too many lines in a subtitle\n"); + current->lines=i; + return current; + } + } + current->lines= ++i; + + return current; +} + +static subtitle_t *sub_read_line_subrip(sputext_decoder_t *this, subtitle_t *current) { + + char line[1001]; + int a1,a2,a3,a4,b1,b2,b3,b4; + char *p=NULL, *q=NULL; + int len; + + bzero (current, sizeof(subtitle_t)); + + while (1) { + if (!fgets (line, 1000, this->fd)) return NULL; + if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4) < 8) continue; + current->start = a1*360000+a2*6000+a3*100+a4; + current->end = b1*360000+b2*6000+b3*100+b4; + + if (!fgets (line, 1000, this->fd)) return NULL; + + p=q=line; + for (current->lines=1; current->lines < SUB_MAX_TEXT; current->lines++) { + for (q=p,len=0; *p && *p!='\r' && *p!='\n' && strncmp(p,"[br]",4); p++,len++); + current->text[current->lines-1]=(char *)xine_xmalloc (len+1); + if (!current->text[current->lines-1]) return ERR; + strncpy (current->text[current->lines-1], q, len); + current->text[current->lines-1][len]='\0'; + if (!*p || *p=='\r' || *p=='\n') break; + while (*p++!=']'); + } + break; + } + return current; +} + +static subtitle_t *sub_read_line_third(sputext_decoder_t *this,subtitle_t *current) { + char line[1001]; + int a1,a2,a3,a4,b1,b2,b3,b4; + char *p=NULL; + int i,len; + + bzero (current, sizeof(subtitle_t)); + + while (!current->text[0]) { + if (!fgets (line, 1000, this->fd)) return NULL; + if ((len=sscanf (line, "%d:%d:%d,%d --> %d:%d:%d,%d",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) + continue; + current->start = a1*360000+a2*6000+a3*100+a4/10; + current->end = b1*360000+b2*6000+b3*100+b4/10; + for (i=0; i<SUB_MAX_TEXT;) { + if (!fgets (line, 1000, this->fd)) break; + len=0; + for (p=line; *p!='\n' && *p!='\r' && *p; p++,len++); + if (len) { + current->text[i]=(char *)xine_xmalloc (len+1); + if (!current->text[i]) return ERR; + strncpy (current->text[i], line, len); current->text[i][len]='\0'; + i++; + } else { + break; + } + } + current->lines=i; + } + return current; +} + +static subtitle_t *sub_read_line_vplayer(sputext_decoder_t *this,subtitle_t *current) { + char line[1001]; + char line2[1001]; + int a1,a2,a3,b1,b2,b3; + char *p=NULL, *next; + int i,len,len2,plen; + + bzero (current, sizeof(subtitle_t)); + + while (!current->text[0]) { + if (!fgets (line, 1000, this->fd)) return NULL; + if ((len=sscanf (line, "%d:%d:%d:%n",&a1,&a2,&a3,&plen)) < 3) + continue; + if (!fgets (line2, 1000, this->fd)) return NULL; + if ((len2=sscanf (line2, "%d:%d:%d:",&b1,&b2,&b3)) < 3) + continue; + /* przewiń o linijkę do tyłu: */ + fseek(this->fd,-strlen(line2),SEEK_CUR); + + current->start = a1*360000+a2*6000+a3*100; + current->end = b1*360000+b2*6000+b3*100; + if ((current->end - current->start) > 1000) + current->end = current->start + 1000; /* not too long though. */ + /* teraz czas na wkopiowanie stringu */ + p=line; + /* finds the body of the subtitle_t */ + for (i=0; i<3; i++){ + p=strchr(p,':')+1; + } + i=0; + + if (*p!='|') { + next = p,i=0; + while ((next =sub_readtext (next, &(current->text[i])))) { + if (current->text[i]==ERR) + return ERR; + i++; + if (i>=SUB_MAX_TEXT) { + printf ("Too many lines in a subtitle\n"); + current->lines=i; + return current; + } + } + current->lines=i+1; + } + } + return current; +} + +static subtitle_t *sub_read_line_rt(sputext_decoder_t *this,subtitle_t *current) { + /* + * TODO: This format uses quite rich (sub/super)set of xhtml + * I couldn't check it since DTD is not included. + * WARNING: full XML parses can be required for proper parsing + */ + char line[1001]; + int a1,a2,a3,a4,b1,b2,b3,b4; + char *p=NULL,*next=NULL; + int i,len,plen; + + bzero (current, sizeof(subtitle_t)); + + while (!current->text[0]) { + if (!fgets (line, 1000, this->fd)) return NULL; + /* + * TODO: it seems that format of time is not easily determined, it may be 1:12, 1:12.0 or 0:1:12.0 + * to describe the same moment in time. Maybe there are even more formats in use. + */ + if ((len=sscanf (line, "<Time Begin=\"%d:%d:%d.%d\" End=\"%d:%d:%d.%d\"",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4)) < 8) + + plen=a1=a2=a3=a4=b1=b2=b3=b4=0; + if ( + ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&plen)) < 4) && + ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&b2,&b3,&b4,&plen)) < 5) && + /* ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&plen)) < 5) && */ + ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d.%d\" %*[Ee]nd=\"%d:%d.%d\"%*[^<]<clear/>%n",&a2,&a3,&a4,&b2,&b3,&b4,&plen)) < 6) && + ((len=sscanf (line, "<%*[tT]ime %*[bB]egin=\"%d:%d:%d.%d\" %*[Ee]nd=\"%d:%d:%d.%d\"%*[^<]<clear/>%n",&a1,&a2,&a3,&a4,&b1,&b2,&b3,&b4,&plen)) < 8) + ) + continue; + current->start = a1*360000+a2*6000+a3*100+a4/10; + current->end = b1*360000+b2*6000+b3*100+b4/10; + p=line; p+=plen;i=0; + /* TODO: I don't know what kind of convention is here for marking multiline subs, maybe <br/> like in xml? */ + next = strstr(line,"<clear/>")+8;i=0; + while ((next =sub_readtext (next, &(current->text[i])))) { + if (current->text[i]==ERR) + return ERR; + i++; + if (i>=SUB_MAX_TEXT) { + printf ("Too many lines in a subtitle\n"); + current->lines=i; + return current; + } + } + current->lines=i+1; + } + return current; +} + +static subtitle_t *sub_read_line_ssa(sputext_decoder_t *this,subtitle_t *current) { + + int hour1, min1, sec1, hunsec1, + hour2, min2, sec2, hunsec2, nothing; + int num; + + char line[1000], + line3[1000], + *line2; + char *tmp; + + do { + if (!fgets (line, 1000, this->fd)) + return NULL; + } while (sscanf (line, "Dialogue: Marked=%d,%d:%d:%d.%d,%d:%d:%d.%d," + "%[^\n\r]", ¬hing, + &hour1, &min1, &sec1, &hunsec1, + &hour2, &min2, &sec2, &hunsec2, + line3) < 9); + line2=strstr(line3,",,"); + if (!line2) return NULL; + line2 ++; + line2 ++; + + current->lines=1;num=0; + current->start = 360000*hour1 + 6000*min1 + 100*sec1 + hunsec1; + current->end = 360000*hour2 + 6000*min2 + 100*sec2 + hunsec2; + + while ( (tmp=strstr(line2, "\\n")) ) { + current->text[num]=(char *)xine_xmalloc(tmp-line2+1); + strncpy (current->text[num], line2, tmp-line2); + current->text[num][tmp-line2]='\0'; + line2=tmp+2; + num++; + current->lines++; + if (current->lines >= SUB_MAX_TEXT) return current; + } + + + current->text[num]=(char *) xine_xmalloc(strlen(line2)+1); + strcpy(current->text[num],line2); + + return current; +} + +static subtitle_t *sub_read_line_dunnowhat (sputext_decoder_t *this, subtitle_t *current) { + char line[1001]; + char text[1001]; + + bzero (current, sizeof(subtitle_t)); + + if (!fgets (line, 1000, this->fd)) + return NULL; + if (sscanf (line, "%ld,%ld,\"%[^\"]", &(current->start), + &(current->end), text) <3) + return ERR; + current->text[0] = strdup(text); + current->lines = 1; + + return current; +} + +static subtitle_t *sub_read_line_mpsub (sputext_decoder_t *this, subtitle_t *current) { + char line[1000]; + float a,b; + int num=0; + char *p, *q; + + do { + if (!fgets(line, 1000, this->fd)) + return NULL; + } while (sscanf (line, "%f %f", &a, &b) !=2); + + this->mpsub_position += (a*100.0); + current->start = (int) this->mpsub_position; + this->mpsub_position += (b*100.0); + current->end = (int) this->mpsub_position; + + while (num < SUB_MAX_TEXT) { + if (!fgets (line, 1000, this->fd)) + return NULL; + + p=line; + while (isspace(*p)) + p++; + + if (eol(*p) && num > 0) + return current; + + if (eol(*p)) + return NULL; + + for (q=p; !eol(*q); q++); + *q='\0'; + if (strlen(p)) { + current->text[num]=strdup(p); + printf (">%s<\n",p); + current->lines = ++num; + } else { + if (num) + return current; + else + return NULL; + } + } + + return NULL; +} + +static subtitle_t *sub_read_line_aqt (sputext_decoder_t *this, subtitle_t *current) { + char line[1001]; + + bzero (current, sizeof(subtitle_t)); + + while (1) { + /* try to locate next subtitle_t */ + if (!fgets (line, 1000, this->fd)) + return NULL; + if (!(sscanf (line, "-->> %ld", &(current->start)) <1)) + break; + } + + if (this->previous_aqt_sub != NULL) + this->previous_aqt_sub->end = current->start-1; + + this->previous_aqt_sub = current; + + if (!fgets (line, 1000, this->fd)) + return NULL; + + sub_readtext((char *) &line,¤t->text[0]); + current->lines = 1; + current->end = current->start; /* will be corrected by next subtitle_t */ + + if (!fgets (line, 1000, this->fd)) + return current;; + + sub_readtext((char *) &line,¤t->text[1]); + current->lines = 2; + + if ((current->text[0]=="") && (current->text[1]=="")) { + /* void subtitle -> end of previous marked and exit */ + this->previous_aqt_sub = NULL; + return NULL; + } + + return current; +} + +static int sub_autodetect (sputext_decoder_t *this) { + + char line[1001]; + int i,j=0; + char p; + + while (j < 100) { + j++; + if (!fgets (line, 1000, this->fd)) + return -1; + + if (sscanf (line, "{%d}{%d}", &i, &i)==2) { + this->uses_time=0; + printf ("sputext: microdvd subtitle format detected\n"); + return FORMAT_MICRODVD; + } + + if (sscanf (line, "%d:%d:%d.%d,%d:%d:%d.%d", &i, &i, &i, &i, &i, &i, &i, &i)==8){ + this->uses_time=1; + printf ("sputext: subrip subtitle format detected\n"); + return FORMAT_SUBRIP; + } + + if (sscanf (line, "%d:%d:%d,%d --> %d:%d:%d,%d", &i, &i, &i, &i, &i, &i, &i, &i)==8) { + this->uses_time=1; + printf ("sputext: subviewer subtitle format detected\n"); + return FORMAT_SUBVIEWER; + } + if (strstr (line, "<SAMI>")) { + this->uses_time=1; + printf ("sputext: sami subtitle format detected\n"); + return FORMAT_SAMI; + } + if (sscanf (line, "%d:%d:%d:", &i, &i, &i )==3) { + this->uses_time=1; + printf ("sputext: vplayer subtitle format detected\n"); + return FORMAT_VPLAYER; + } + /* + * TODO: just checking if first line of sub starts with "<" is WAY + * too weak test for RT + * Please someone who knows the format of RT... FIX IT!!! + * It may conflict with other sub formats in the future (actually it doesn't) + */ + if ( *line == '<' ) { + this->uses_time=1; + printf ("sputext: rt subtitle format detected\n"); + return FORMAT_RT; + } + if (!memcmp(line, "Dialogue: Marked", 16)){ + this->uses_time=1; + printf ("sputext: ssa subtitle format detected\n"); + return FORMAT_SSA; + } + if (sscanf (line, "%d,%d,\"%c", &i, &i, (char *) &i) == 3) { + this->uses_time=0; + printf ("sputext: (dunno) subtitle format detected\n"); + return FORMAT_DUNNO; + } + if (sscanf (line, "FORMAT=%d", &i) == 1) { + this->uses_time=0; + printf ("sputext: mpsub subtitle format detected\n"); + return FORMAT_MPSUB; + } + if (sscanf (line, "FORMAT=TIM%c", &p)==1 && p=='E') { + this->uses_time=1; + printf ("sputext: mpsub subtitle format detected\n"); + return FORMAT_MPSUB; + } + if (strstr (line, "-->>")) { + this->uses_time=0; + printf ("sputext: aqtitle subtitle format detected\n"); + return FORMAT_AQTITLE; + } + } + + return -1; /* too many bad lines */ +} + +static subtitle_t *sub_read_file (sputext_decoder_t *this) { + + int n_max; + subtitle_t *first; + subtitle_t * (*func[])(sputext_decoder_t *this,subtitle_t *dest)= + { + sub_read_line_microdvd, + sub_read_line_subrip, + sub_read_line_third, + sub_read_line_sami, + sub_read_line_vplayer, + sub_read_line_rt, + sub_read_line_ssa, + sub_read_line_dunnowhat, + sub_read_line_mpsub, + sub_read_line_aqt + + }; + + this->format=sub_autodetect (this); + if (this->format==-1) { + printf ("sputext: Could not determine file format\n"); + return NULL; + } + + printf ("sputext: Detected subtitle file format: %d\n",this->format); + + rewind (this->fd); + + this->num=0;n_max=32; + first = (subtitle_t *) xine_xmalloc(n_max*sizeof(subtitle_t)); + if(!first) return NULL; + + while(1){ + subtitle_t *sub; + if(this->num>=n_max){ + n_max+=16; + first=realloc(first,n_max*sizeof(subtitle_t)); + } + sub = func[this->format] (this, &first[this->num]); + if (!sub) + break; /* EOF */ + + if (sub==ERR) + ++this->errs; + else { + ++this->num; /* Error vs. Valid */ + + } + } + + printf ("sputext: Read %i subtitles", this->num); + if (this->errs) + printf (", %i bad line(s).\n", this->errs); + else + printf (".\n"); + + return first; +} + + +static void list_sub_file (sputext_decoder_t *this, subtitle_t* subs) { + + int i,j; + + for(j=0;j<this->num;j++){ + subtitle_t* egysub=&subs[j]; + printf ("%i line%c (%li-%li) ", + egysub->lines, + (1==egysub->lines)?' ':'s', + egysub->start, + egysub->end); + for (i=0; i<egysub->lines; i++) { + printf ("%s%s",egysub->text[i], i==egysub->lines-1?"":" <BREAK> "); + } + printf ("\n"); + } + + printf ("Subtitle format %s time.\n", this->uses_time?"uses":"doesn't use"); + printf ("Read %i subtitles, %i errors.\n", this->num, this->errs); + +} + +static int spudec_can_handle (spu_decoder_t *this_gen, int buf_type) { + int type = buf_type & 0xFFFF0000; + return (type == BUF_SPU_TEXT); +} + + + +static void spudec_init (spu_decoder_t *this_gen, vo_instance_t *vo_out) { + + sputext_decoder_t *this = (sputext_decoder_t *) this_gen; + + this->vo_out = vo_out; + this->output_open = 0; + + this->mpsub_position = 0; + this->uses_time = 0; + this->errs = 0; + this->num = 0; + this->format = 0; + this->previous_aqt_sub = NULL; + + this->osd = osd_open (this->xine->osd_renderer, 500, 100); + + osd_set_font (this->osd,"vga"); + osd_render_text (this->osd, 0, 0, "sputext decoder"); + osd_set_position (this->osd, 10, 30); + + osd_show (this->osd, 0); + osd_hide (this->osd, 300000); + +} + +#define PTS_FACTOR 9000 + +static void *spudec_loop (void *this_gen) { + + sputext_decoder_t *this = (sputext_decoder_t *) this_gen; + + struct timespec tenth_second; + subtitle_t *current; + int count; + int32_t pts_factor; + + tenth_second.tv_sec = 0; + tenth_second.tv_nsec = 100000000; + + /* wait two seconds so metronom can determine the correct frame rate */ + + for (count = 0; count<20; count++) + nanosleep (&tenth_second, NULL); + + current = this->subtitles; + + count = 0; + + while (current && this->running) { + + int32_t diff, sub_pts, wrap_offset, pts; + + pts = this->xine->metronom->get_current_time (this->xine->metronom); + + if (this->uses_time) + pts_factor = 9000; + else + pts_factor = this->xine->metronom->get_video_rate (this->xine->metronom); + +#ifdef LOG + printf ("pts_factor : %d\n", pts_factor); +#endif + + if (!pts_factor) { + nanosleep (&tenth_second, NULL); + continue; + } + + sub_pts = (current->start * pts_factor) + this->xine->metronom->video_wrap_offset; + + diff = sub_pts - pts ; + + if (diff < 0) { + +#ifdef LOG + printf ("sputext: current is '%s' - too old start time %d, diff %d\n", + current->text[0], sub_pts, diff ); +#endif + + current++; count++; + if (count >= this->num) + current = NULL; + + continue; + + } + +#ifdef LOG + printf ("sputext: current is '%s' (actually %d lines), start time %d, diff %d\n", + current->text[0], current->lines, sub_pts, diff); +#endif + + if (diff < 30000) { + + int line; + + osd_filled_rect (this->osd, 0, 0, 499, 99, 0); + + for (line=0; line<current->lines; line++) + osd_render_text (this->osd, 0, line*20, current->text[line]); + + osd_show (this->osd, sub_pts); + osd_hide (this->osd, current->end * pts_factor + this->xine->metronom->video_wrap_offset); + + current++; count++; + if (count >= this->num) + current = NULL; + + } + + nanosleep (&tenth_second, NULL); + } + + printf ("sputext: thread finished\n"); + + pthread_exit (NULL); + + return NULL; +} + +static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) { + + sputext_decoder_t *this = (sputext_decoder_t *) this_gen; + int err; + + this->fd = (FILE *) buf->content; + + this->subtitles = sub_read_file (this); + + printf ("sputext: subtitle format %s time.\n", this->uses_time?"uses":"doesn't use"); + printf ("sputext: read %i subtitles, %i errors.\n", this->num, this->errs); + + /* start thread */ + + this->running = 1; + + if ((err = pthread_create (&this->spu_thread, + NULL, spudec_loop, this)) != 0) { + printf ("sputext: can't create new thread (%s)\n", + strerror(err)); + exit (1); + } + +} + + +static void spudec_close (spu_decoder_t *this_gen) { + sputext_decoder_t *this = (sputext_decoder_t *) this_gen; + void *p; + + printf ("sputext: stopping thread...\n"); + + this->running = 0; + + pthread_join (this->spu_thread, &p); + + printf ("sputext: ...thread stopped\n"); +} + +static char *spudec_get_id(void) { + return "sputext"; +} + +spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine) { + + sputext_decoder_t *this ; + + if (iface_version != 4) { + printf("libsputext: doesn't support plugin api version %d.\n" + "libsputext: This means there is a version mismatch between xine and\n" + "libsputext: this plugin.\n", iface_version); + return NULL; + } + + this = (sputext_decoder_t *) xine_xmalloc (sizeof (sputext_decoder_t)); + + this->spu_decoder.interface_version = 4; + this->spu_decoder.can_handle = spudec_can_handle; + this->spu_decoder.init = spudec_init; + this->spu_decoder.decode_data = spudec_decode_data; + this->spu_decoder.close = spudec_close; + this->spu_decoder.get_identifier = spudec_get_id; + this->spu_decoder.priority = 1; + + this->xine = xine; + + return (spu_decoder_t *) this; +} + diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 22288ecbd..480f1031e 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: buffer.h,v 1.25 2001/11/30 19:31:55 jcdutton Exp $ + * $Id: buffer.h,v 1.26 2001/12/01 22:38:32 guenter Exp $ * * * contents: @@ -123,6 +123,7 @@ extern "C" { #define BUF_SPU_PACKAGE 0x04010000 #define BUF_SPU_SUBP_CONTROL 0x04020000 #define BUF_SPU_NAV 0x04030000 +#define BUF_SPU_TEXT 0x04040000 /* demuxer block types: */ diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index abde13c37..02e220733 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: configfile.c,v 1.12 2001/11/30 21:55:06 f1rmb Exp $ + * $Id: configfile.c,v 1.13 2001/12/01 22:38:32 guenter Exp $ * * config file management - implementation * @@ -101,27 +101,6 @@ cfg_entry_t *config_file_lookup_entry (config_values_t *this, char *key) { } -static void config_file_register_empty (config_values_t *this, char *key) { - cfg_entry_t *entry; - - assert(key); - -#ifdef CONFIG_LOG - printf ("configfile: register empty %s\n", key); -#endif - - entry = config_file_lookup_entry (this, key); - - /* - * Don't register as empty if entry already exist. - */ - if(entry) - return; - - entry = config_file_add (this, key); -} - - static char *config_file_register_string (config_values_t *this, char *key, char *def_value, char *description, @@ -594,7 +573,6 @@ config_values_t *config_file_init (char *filename) { exit (1); } - this->register_empty = config_file_register_empty; this->register_string = config_file_register_string; this->register_range = config_file_register_range; this->register_enum = config_file_register_enum; @@ -613,6 +591,9 @@ config_values_t *config_file_init (char *filename) { /* * $Log: configfile.c,v $ + * Revision 1.13 2001/12/01 22:38:32 guenter + * add avi subtitle decoder (based on mplayer code), minor cleanups, removed register_empty function from configfile (undocumented and doesn't make sense) + * * Revision 1.12 2001/11/30 21:55:06 f1rmb * Add an automatic way for input plugin to add extra valid mrls: * add at bottom of init_input_plugin() a line like this: diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h index 4085098b8..74831d526 100644 --- a/src/xine-engine/configfile.h +++ b/src/xine-engine/configfile.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: configfile.h,v 1.6 2001/11/30 21:55:06 f1rmb Exp $ + * $Id: configfile.h,v 1.7 2001/12/01 22:38:32 guenter Exp $ * * config file management * @@ -95,9 +95,6 @@ struct config_values_s { * from the config file otherwise */ - void (*register_empty) (config_values_t *this, - char *key); - char* (*register_string) (config_values_t *this, char *key, char *def_value, @@ -191,6 +188,9 @@ config_values_t *config_file_init (char *filename); /* * $Log: configfile.h,v $ + * Revision 1.7 2001/12/01 22:38:32 guenter + * add avi subtitle decoder (based on mplayer code), minor cleanups, removed register_empty function from configfile (undocumented and doesn't make sense) + * * Revision 1.6 2001/11/30 21:55:06 f1rmb * Add an automatic way for input plugin to add extra valid mrls: * add at bottom of init_input_plugin() a line like this: diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index d03d8d7ba..4d4c10b6c 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.65 2001/11/17 14:26:39 f1rmb Exp $ + * $Id: video_decoder.c,v 1.66 2001/12/01 22:38:32 guenter Exp $ * */ @@ -134,6 +134,7 @@ void *video_decoder_loop (void *this_gen) { case BUF_SPU_SUBP_CONTROL: case BUF_SPU_CLUT: case BUF_SPU_PACKAGE: + case BUF_SPU_TEXT: xine_profiler_start_count (prof_spu_decode); spu_decoder = update_spu_decoder(this, buf->type); |