[Mplayer-cvslog] CVS: main subreader.c,NONE,1.1 subreader.h,NONE,1.1 mplayer.c,1.32,1.33 cfg-mplayer.h,1.10,1.11
GEREOFFY
arpi_esp at users.sourceforge.net
Fri Mar 30 05:07:47 CEST 2001
Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv4835
Modified Files:
mplayer.c cfg-mplayer.h
Added Files:
subreader.c subreader.h
Log Message:
subtitles (.sub files) support
--- NEW FILE ---
/*
* Subtitle reader with format autodetection
* Mier nem muxik realloccal!?!?! - nekem muxik :)
*
* Written by laaz
* Some code cleanup & realloc() by A'rpi/ESP-team
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "subreader.h"
#define ERR (void *)-1
int sub_uses_time=0;
int sub_errs=0;
int sub_num=0; // number of subtitle structs
int sub_format=-1; // 0 for microdvd, 1 for SubRip, 2 for the third format
char *sub_readtext(char *source, char **dest) {
int len=0;
char *p;
for (p=source;*p!='\r' && *p!='\n' && *p!='|'; p++,len++);
*dest= (char *)malloc (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
}
subtitle *sub_read_line_microdvd(FILE *fd,subtitle *current) {
char line[1001];
char line2[1001];
char *p, *next;
int i;
bzero (current, sizeof(current));
do {
if (!fgets (line, 1000, fd)) return NULL;
} while (*line=='\n' || *line == '\r' || !*line);
if (sscanf (line, "{%i}{%i}%s", &(current->start), &(current->end),line2) <2) {return ERR;}
p=line;
while (*p++!='}');
while (*p++!='}');
next=p, i=0;
while ((next =sub_readtext (next, &(current->text[i])))) {
if (current->text[i]==ERR || current->text[i]==ERR) {return ERR;}
i++;
if (i>SUB_MAX_TEXT) { printf ("Too many lines in a subtitle\n");return ERR;}
}
current->lines=i+1;
return current;
}
subtitle *sub_read_line_subrip(FILE *fd, subtitle *current) {
char line[1001];
int a1,a2,a3,a4,b1,b2,b3,b4;
char *p=NULL, *q=NULL;
int len;
bzero (current, sizeof(current));
while (!current->text[0]) {
if (!fgets (line, 1000, fd)) return NULL;
if (sscanf (line, "%i:%i:%i.%i,%i:%i:%i.%i",&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, 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 *)malloc (len+1);
if (!current->text[current->lines-1]) return ERR;
strncpy (current->text[current->lines-1], q, len);
if (!*p || *p=='\r' || *p=='\n') break;
while (*p++!=']');
}
}
return current;
}
subtitle *sub_read_line_third(FILE *fd,subtitle *current) {
char line[1001];
int a1,a2,a3,a4,b1,b2,b3,b4;
char *p=NULL;
int i,len;
bzero (current, sizeof(current));
while (!current->text[0]) {
if (!fgets (line, 1000, fd)) return NULL;
if ((len=sscanf (line, "%i:%i:%i,%i --> %i:%i:%i,%i",&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, fd)) return NULL;
len=0;
for (p=line; *p!='\n' && *p!='\r' && *p; p++,len++);
if (len) {
current->text[i]=(char *)malloc (len+1);
if (!current->text[i]) return ERR;
strncpy (current->text[i], line, len);
i++;
} else {
break;
}
}
current->lines=i;
}
return current;
}
int sub_autodetect (FILE *fd) {
char line[1001];
int i,j=0;
// char *p;
while (1) {
j++;
if (!fgets (line, 1000, fd))
return -1;
// if (sscanf (line, "{%i}{%i}", &i, &i, p)==2) // ha valaki tudja miert 2, mondja mar el nekem ;)
if (sscanf (line, "{%i}{%i}", &i, &i)==2) // ha valaki tudja miert 2, mondja mar el nekem ;)
{sub_uses_time=0;return 0;}
if (sscanf (line, "%i:%i:%i.%i,%i:%i:%i.%i", &i, &i, &i, &i, &i, &i, &i, &i)==8)
{sub_uses_time=1;return 1;}
if (sscanf (line, "%i:%i:%i,%i --> %i:%i:%i,%i", &i, &i, &i, &i, &i, &i, &i, &i)==8)
{sub_uses_time=1;return 2;}
if (j>100) return -1; // too many bad lines or bad coder
}
}
subtitle* sub_read_file (char *filename) {
FILE *fd;
int n_max;
subtitle *first;
subtitle * (*func[3])(FILE *fd,subtitle *dest)=
{
sub_read_line_microdvd,
sub_read_line_subrip,
sub_read_line_third
};
fd=fopen (filename, "r"); if (!fd) return NULL;
sub_format=sub_autodetect (fd);
if (sub_format==-1) {printf ("SUB: Could not determine file format\n");return NULL;}
printf ("SUB: Detected subtitle file format: %i\n",sub_format);
rewind (fd);
sub_num=0;n_max=32;
first=(subtitle *)malloc(n_max*sizeof(subtitle));
if(!first) return NULL;
while(1){
subtitle *sub;
if(sub_num>=n_max){
n_max+=16;
first=realloc(first,n_max*sizeof(subtitle));
}
sub=func[sub_format](fd,&first[sub_num]);
if(!sub) break; // EOF
if(sub==ERR) ++sub_errs; else ++sub_num; // Error vs. Valid
}
fclose(fd);
// printf ("SUB: Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use");
printf ("SUB: Read %i subtitles, %i errors.\n", sub_num, sub_errs);
return first;
}
#if 0
int main(int argc, char **argv) { // for testing
int i,j;
subtitle *subs;
subtitle *egysub;
if(argc<2){
printf("\nUsage: subreader filename.sub\n\n");
exit(1);
}
subs=sub_get_subtitles(argv[1]);
if(!subs){
printf("Couldn't load file... let's write a bugreport :)\n");
exit(1);
}
for(j=0;j<sub_num;j++){
egysub=&subs[j];
printf ("%i line%c (%i-%i) ",
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", sub_uses_time?"uses":"doesn't use");
printf ("Read %i subtitles, %i errors.\n", sub_num, sub_errs);
return 0;
}
#endif
--- NEW FILE ---
extern int sub_uses_time;
extern int sub_errs;
extern int sub_num; // number of subtitle structs
extern int sub_format; // 0 for microdvd, 1 for SubRip, 2 for the third format
#define SUB_MAX_TEXT 5
typedef struct {
int lines;
unsigned long start;
unsigned long end;
char *text[SUB_MAX_TEXT];
} subtitle;
subtitle* sub_read_file (char *filename);
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -r1.32 -r1.33
*** mplayer.c 2001/03/28 22:45:57 1.32
--- mplayer.c 2001/03/30 03:07:45 1.33
***************
*** 38,41 ****
--- 38,43 ----
#include "cfg-mplayer-def.h"
+ #include "subreader.h"
+
#include "libvo/video_out.h"
#include "libvo/sub.h"
***************
*** 95,98 ****
--- 97,134 ----
static int verbose=0;
+ //**************************************************************************//
+ // .SUB
+ //**************************************************************************//
+
+ static current_sub=0;
+
+ static subtitle* subtitles=NULL;
+
+ void find_sub(unsigned long key){
+ int i,j;
+ if(current_sub<0 || current_sub>=sub_num) current_sub=0;
+ vo_sub=&subtitles[current_sub];
+ if(key>=vo_sub->start && key<=vo_sub->end) return; // OK!
+ // use logarithmic search:
+ i=0;j=sub_num-1;
+ // printf("Searching %d in %d..%d\n",key,subtitles[i].start,subtitles[j].end);
+ while(j>=i){
+ current_sub=(i+j+1)/2;
+ if(key<subtitles[current_sub].start)
+ j=current_sub-1;
+ else
+ if(key>subtitles[current_sub].end)
+ i=current_sub+1;
+ else break; // found!
+ }
+ vo_sub=&subtitles[current_sub];
+ if(key>=vo_sub->start && key<=vo_sub->end) return; // OK!
+ vo_sub=NULL; // no sub here
+ }
+
+ //**************************************************************************//
+ // Config file
+ //**************************************************************************//
+
static int cfg_inc_verbose(struct config *conf){
++verbose;
***************
*** 419,422 ****
--- 455,461 ----
char *font_name=NULL;
float font_factor=0.75;
+ char *sub_name=NULL;
+ float sub_delay=0;
+ float sub_fps=0;
#include "cfg-mplayer.h"
***************
*** 473,476 ****
--- 512,525 ----
}
+ // check .sub
+ if(sub_name){
+ subtitles=sub_read_file(sub_name);
+ if(!subtitles) printf("Can't load subtitles: %s\n",font_name);
+ } else {
+ // try default:
+ subtitles=sub_read_file(get_path("default.sub"));
+ }
+
+
// check video_out driver name:
if(!video_driver)
***************
*** 2311,2314 ****
--- 2360,2369 ----
// for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0;
vo_osd_text=osd_text_buffer;
+
+ // find sub
+ if(subtitles){
+ if(sub_fps==0) sub_fps=default_fps;
+ find_sub(sub_uses_time?(100*(v_pts+sub_delay)):((v_pts+sub_delay)*sub_fps)); // FIXME! frame counter...
+ }
}
Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** cfg-mplayer.h 2001/03/28 12:08:44 1.10
--- cfg-mplayer.h 2001/03/30 03:07:45 1.11
***************
*** 14,17 ****
--- 14,20 ----
#endif
{"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0},
+ {"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0},
+ {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
+ {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
{"font", &font_name, CONF_TYPE_STRING, 0, 0, 0},
{"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0},
_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog
More information about the MPlayer-cvslog
mailing list