Commit aafd5b0d authored by Laurent Aimar's avatar Laurent Aimar

* modules/demux/util : add a text subtitle demuxer. (Module called by demux).

MicroDVD, SubRIP, SSA subtitle format should work...
 Options: --sub-file <subtitle file> [--sub-fps, --sub-delay --sub-format].

 * modules/demux/avi : make use of subtitle parser.
 * modules/demux/asf : display movie length. (It will not work with live
streams of course).

 modules/codec/spudec : use i_dts to send end of display time for subtitle.
(Yes it's ugly, but it works :)
parent d2d2e4f9
......@@ -585,7 +585,7 @@ PLUGINS="${PLUGINS} aout_file"
#PLUGINS="${PLUGINS} scope"
PLUGINS="${PLUGINS} i420_rgb i420_yuy2 i422_yuy2 i420_ymga"
PLUGINS="${PLUGINS} id3 m3u"
PLUGINS="${PLUGINS} wav araw demuxdump"
PLUGINS="${PLUGINS} wav araw demuxdump demuxsub"
dnl
dnl Network modules
......
......@@ -2,7 +2,7 @@
* text.c: text subtitles parser
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: text.c,v 1.1 2002/11/06 21:48:24 gbazin Exp $
* $Id: text.c,v 1.2 2002/11/15 18:10:26 fenrir Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -43,10 +43,11 @@
void E_(ParseText)( spudec_thread_t *p_spudec, subtitler_font_t *p_font )
{
char * psz_subtitle;
mtime_t i_pts;
mtime_t i_pts, i_dts;
/* We cannot display a subpicture with no date */
i_pts = p_spudec->bit_stream.p_pes->i_pts;
i_dts = p_spudec->bit_stream.p_pes->i_dts;
if( i_pts == 0 )
{
/* Dump the packet */
......@@ -75,7 +76,7 @@ void E_(ParseText)( spudec_thread_t *p_spudec, subtitler_font_t *p_font )
subtitler_PlotSubtitle( p_spudec->p_vout,
psz_subtitle, p_font,
i_pts,
0 );
i_dts );
}
/* Prepare for next time. No need to check that
......
......@@ -2,7 +2,7 @@
* asf.c : ASFv01 file input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: asf.c,v 1.5 2002/11/14 16:17:47 fenrir Exp $
* $Id: asf.c,v 1.6 2002/11/15 18:10:26 fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
......@@ -292,9 +292,6 @@ static int Activate( vlc_object_t * p_this )
vlc_mutex_unlock( &p_input->stream.stream_lock );
}
vlc_mutex_lock( &p_input->stream.stream_lock );
p_input->stream.p_selected_program->b_is_ok = 1;
vlc_mutex_unlock( &p_input->stream.stream_lock );
p_demux->i_data_begin = p_demux->root.p_data->i_object_pos + 50;
if( p_demux->root.p_data->i_object_size != 0 )
......@@ -310,6 +307,46 @@ static int Activate( vlc_object_t * p_this )
// go to first packet
ASF_SeekAbsolute( p_input, p_demux->i_data_begin );
vlc_mutex_lock( &p_input->stream.stream_lock );
/* try to calculate movie time */
if( p_demux->p_fp->i_data_packets_count > 0 )
{
int64_t i_count;
mtime_t i_length;
/* real number of packets */
i_count = ( p_input->stream.p_selected_area->i_size -
p_demux->i_data_begin ) /
p_demux->p_fp->i_min_data_packet_size;
/* calculate the time duration in s */
i_length = (mtime_t)p_demux->p_fp->i_play_duration / 10 *
(mtime_t)i_count /
(mtime_t)p_demux->p_fp->i_data_packets_count /
(mtime_t)1000000;
if( i_length > 0 )
{
p_input->stream.i_mux_rate =
p_input->stream.p_selected_area->i_size / 50 / i_length;
}
else
{
p_input->stream.i_mux_rate = 0;
}
}
else
{
/* cannot known */
p_input->stream.i_mux_rate = 0;
}
p_input->stream.p_selected_program->b_is_ok = 1;
vlc_mutex_unlock( &p_input->stream.stream_lock );
return( 0 );
}
......
......@@ -2,7 +2,7 @@
* avi.c : AVI file Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: avi.c,v 1.11 2002/11/08 10:26:53 gbazin Exp $
* $Id: avi.c,v 1.12 2002/11/15 18:10:26 fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
......@@ -34,6 +34,12 @@
#include "video.h"
#include "libavi.h"
#define __AVI_SUBTITLE__ 1
#ifdef __AVI_SUBTITLE__
# include "../util/sub.h"
#endif
#include "avi.h"
/*****************************************************************************
......@@ -744,6 +750,13 @@ static void __AVIEnd ( vlc_object_t * p_this )
}
free( p_avi->pp_info );
}
#ifdef __AVI_SUBTITLE__
if( p_avi->p_sub )
{
subtitle_Close( p_avi->p_sub );
p_avi->p_sub = NULL;
}
#endif
AVI_ChunkFreeRoot( p_input, &p_avi->ck_root );
}
......@@ -764,7 +777,10 @@ static int AVIInit( vlc_object_t * p_this )
demux_sys_t *p_avi;
es_descriptor_t *p_es = NULL; /* avoid warning */
int i;
#ifdef __AVI_SUBTITLE__
mtime_t i_microsecperframe = 0; // for some subtitle format
#endif
vlc_bool_t b_stream_audio, b_stream_video;
p_input->pf_demux = AVIDemux_Seekable;
......@@ -954,6 +970,14 @@ static int AVIInit( vlc_object_t * p_this )
p_avi_strf_vids->p_bih->biBitCount,
(float)p_info->i_rate /
(float)p_info->i_scale );
#ifdef __AVI_SUBTITLE__
if( i_microsecperframe == 0 )
{
i_microsecperframe = (mtime_t)1000000 *
(mtime_t)p_info->i_scale /
(mtime_t)p_info->i_rate;
}
#endif
break;
default:
msg_Err( p_input, "stream[%d] unknown type", i );
......@@ -983,6 +1007,14 @@ static int AVIInit( vlc_object_t * p_this )
}
#undef p_info
}
#ifdef __AVI_SUBTITLE__
if( ( p_avi->p_sub = subtitle_New( p_input, NULL, i_microsecperframe ) ) )
{
subtitle_Select( p_avi->p_sub );
}
#endif
if( config_GetInt( p_input, "avi-index" ) )
{
if( p_avi->b_seekable )
......@@ -1593,6 +1625,13 @@ static int AVIDemux_Seekable( input_thread_t *p_input )
// input_ClockInit( p_input->stream.p_selected_program );
AVISeek( p_input, i_date, i_percent);
#ifdef __AVI_SUBTITLE__
if( p_avi->p_sub )
{
subtitle_Seek( p_avi->p_sub, p_avi->i_time );
}
#endif
}
......@@ -1607,6 +1646,12 @@ static int AVIDemux_Seekable( input_thread_t *p_input )
p_avi->i_time += 100*1000; /* read 100ms */
#ifdef __AVI_SUBTITLE__
if( p_avi->p_sub )
{
subtitle_Demux( p_avi->p_sub, p_avi->i_time );
}
#endif
/* init toread */
for( i_stream = 0; i_stream < p_avi->i_streams; i_stream++ )
{
......
......@@ -2,7 +2,7 @@
* avi.h : AVI file Stream input module for vlc
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: avi.h,v 1.6 2002/11/06 14:44:30 sam Exp $
* $Id: avi.h,v 1.7 2002/11/15 18:10:26 fenrir Exp $
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
......@@ -20,7 +20,6 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/
typedef struct avi_packet_s
{
vlc_fourcc_t i_fourcc;
......@@ -84,5 +83,9 @@ struct demux_sys_t
int i_streams;
avi_stream_t **pp_info;
#ifdef __AVI_SUBTITLE__
subtitle_demux_t *p_sub;
#endif
};
SOURCES_id3 = modules/demux/util/id3.c
SOURCES_id3tag = modules/demux/util/id3tag.c
SOURCES_demuxsub = modules/demux/util/sub.c
noinst_HEADERS += \
modules/demux/util/sub.h
/*****************************************************************************
* sub.c
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: sub.c,v 1.1 2002/11/15 18:10:26 fenrir Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* This program 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.
*
* This program 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, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <sys/types.h>
#include <vlc/vlc.h>
#include <vlc/input.h>
#include "video.h"
#include "sub.h"
static int Open ( vlc_object_t *p_this );
static int sub_open ( subtitle_demux_t *p_sub,
input_thread_t *p_input,
char *psz_name,
mtime_t i_microsecperframe );
static int sub_demux( subtitle_demux_t *p_sub, mtime_t i_maxdate );
static int sub_seek ( subtitle_demux_t *p_sub, mtime_t i_date );
static void sub_close( subtitle_demux_t *p_sub );
static int sub_MicroDvdRead( FILE *p_file, subtitle_t *p_subtitle, mtime_t i_microsecperframe );
static int sub_SubRipRead( FILE *p_file, subtitle_t *p_subtitle, mtime_t i_microsecperframe );
static int sub_SSA1Read( FILE *p_file, subtitle_t *p_subtitle, mtime_t i_microsecperframe );
static int sub_SSA2_4Read( FILE *p_file, subtitle_t *p_subtitle, mtime_t i_microsecperframe );
static void sub_fix( subtitle_demux_t *p_sub );
static char *ppsz_sub_type[] = { "microdvd", "subrip", "ssa1", "ssa2-4", NULL };
/*****************************************************************************
* Module descriptor
*****************************************************************************/
#define SUB_FPS_LONGTEXT \
"Override frames per second" \
"It will work only with MicroDVD"
#define SUB_TYPE_LONGTEXT \
"One from \"microdvd\", \"subrip\", \"ssa1\", \"ssa2-4\"" \
"(nothing for autodetection, It should always work)"
vlc_module_begin();
set_description( _("text subtitle demux") );
set_capability( "subtitle demux", 12 );
add_category_hint( "subtitle", NULL );
add_string( "sub-file", NULL, NULL,
"subtitle file name", "subtitle file name" );
add_float( "sub-fps", 0.0, NULL,
"override frames per second",
SUB_FPS_LONGTEXT );
add_integer( "sub-delay", 0, NULL,
"delay subtitles (in 1/10s)",
"delay subtitles (in 1/10s)" );
add_string_from_list( "sub-type", NULL, ppsz_sub_type, NULL,
"subtitle type",
SUB_TYPE_LONGTEXT );
set_callbacks( Open, NULL );
vlc_module_end();
/*****************************************************************************
* Module initializer
*****************************************************************************/
static int Open ( vlc_object_t *p_this )
{
subtitle_demux_t *p_sub = (subtitle_demux_t*)p_this;
p_sub->pf_open = sub_open;
p_sub->pf_demux = sub_demux;
p_sub->pf_seek = sub_seek;
p_sub->pf_close = sub_close;
return VLC_SUCCESS;
}
#define MAX_TRY 256
#define MAX_LINE 2048
/*****************************************************************************
* sub_open: Open a subtitle file and add subtitle ES
*****************************************************************************/
static int sub_open ( subtitle_demux_t *p_sub,
input_thread_t *p_input,
char *psz_name,
mtime_t i_microsecperframe )
{
FILE *p_file;
char *psz_file_type;
char buffer[MAX_LINE + 1];
int i_try;
int i_sub_type;
int i_max;
int (*pf_read_subtitle)( FILE *p_file, subtitle_t *p_subtitle, mtime_t i_microsecperframe ) = NULL;
p_sub->i_sub_type = SUB_TYPE_UNKNOWN;
p_sub->p_es = NULL;
p_sub->i_subtitles = 0;
p_sub->subtitle = NULL;
p_sub->p_input = p_input;
if( !psz_name || !*psz_name)
{
psz_name = config_GetPsz( p_sub, "sub-file" );
if( !psz_name || !*psz_name )
{
return( -1 );
}
}
if( config_GetFloat( p_sub, "sub-fps" ) >= 1.0 )
{
i_microsecperframe = (mtime_t)( (float)1000000 /
config_GetFloat( p_sub, "sub-fps" ) );
}
else if( i_microsecperframe <= 0 )
{
i_microsecperframe = 40000; /* default: 25fps */
}
/* *** Open the file *** */
if( !( p_file = fopen( psz_name, "r" ) ) )
{
msg_Err( p_sub, "cannot open `%s' subtitle file", psz_name );
}
else
{
msg_Dbg( p_sub, "opened `%s'", psz_name );
}
psz_file_type = config_GetPsz( p_sub, "sub-type" );
if( psz_file_type && *psz_file_type)
{
if( !strcmp( psz_file_type, "microdvd" ) )
{
i_sub_type = SUB_TYPE_MICRODVD;
}
else if( !strcmp( psz_file_type, "subrip" ) )
{
i_sub_type = SUB_TYPE_SUBRIP;
}
else if( !strcmp( psz_file_type, "ssa1" ) )
{
i_sub_type = SUB_TYPE_SSA1;
}
else if( !strcmp( psz_file_type, "ssa2-4" ) )
{
i_sub_type = SUB_TYPE_SSA2_4;
}
else
{
i_sub_type = SUB_TYPE_UNKNOWN;
}
}
else
{
i_sub_type = SUB_TYPE_UNKNOWN;
}
/* *** Now try to autodetect subtitle format *** */
if( i_sub_type == SUB_TYPE_UNKNOWN )
{
msg_Dbg( p_input, "trying to autodetect file format" );
for( i_try = 0; i_try < MAX_TRY; i_try++ )
{
int i_dummy;
if( fgets( buffer, MAX_LINE, p_file ) <= 0 )
{
break;
}
if( sscanf( buffer, "{%d}{%d}", &i_dummy, &i_dummy ) == 2 ||
sscanf( buffer, "{%d}{}", &i_dummy ) == 1)
{
i_sub_type = SUB_TYPE_MICRODVD;
break;
}
else if( sscanf( buffer,
"%d:%d:%d,%d --> %d:%d:%d,%d",
&i_dummy,&i_dummy,&i_dummy,&i_dummy,
&i_dummy,&i_dummy,&i_dummy,&i_dummy ) == 8 )
{
i_sub_type = SUB_TYPE_SUBRIP;
break;
}
else if( sscanf( buffer,
"!: This is a Sub Station Alpha v%d.x script.",
&i_dummy ) == 1)
{
if( i_dummy <= 1 )
{
i_sub_type = SUB_TYPE_SSA1;
}
else
{
i_sub_type = SUB_TYPE_SSA2_4; // I hop this will work
}
}
else if( !strcmp( buffer,
"Dialogue: Marked" ) )
{
i_sub_type = SUB_TYPE_SSA2_4; // could be wrong
}
}
}
/* *** Load this file in memory *** */
switch( i_sub_type )
{
case SUB_TYPE_MICRODVD:
msg_Dbg( p_input, "detected MicroDVD format" );
pf_read_subtitle = sub_MicroDvdRead;
break;
case SUB_TYPE_SUBRIP:
msg_Dbg( p_input, "detected SubRIP format" );
pf_read_subtitle = sub_SubRipRead;
break;
case SUB_TYPE_SSA1:
msg_Dbg( p_input, "detected SSAv1 Script format" );
pf_read_subtitle = sub_SSA1Read;
break;
case SUB_TYPE_SSA2_4:
msg_Dbg( p_input, "detected SSAv2-4 Script format" );
pf_read_subtitle = sub_SSA2_4Read;
break;
default:
msg_Err( p_sub, "unknown subtitile file" );
fclose( p_file );
return( -1 );
}
if( fseek( p_file, 0L, SEEK_SET ) < 0 )
{
msg_Err( p_input, "cannot read file from begining" );
fclose( p_file );
return( -1 );
}
for( i_max = 0;; )
{
if( p_sub->i_subtitles <= i_max )
{
i_max += 128;
if( p_sub->subtitle )
{
p_sub->subtitle = realloc( p_sub->subtitle,
sizeof( subtitle_t ) * i_max );
}
else
{
p_sub->subtitle = malloc( sizeof( subtitle_t ) * i_max );
}
}
if( pf_read_subtitle( p_file,
p_sub->subtitle + p_sub->i_subtitles,
i_microsecperframe ) < 0 )
{
break;
}
p_sub->i_subtitles++;
}
msg_Dbg( p_sub, "loaded %d subtitles", p_sub->i_subtitles );
/* *** Close the file *** */
fclose( p_file );
/* *** fix subtitle (order and time) *** */
p_sub->i_subtitle = 0; // will be modified by sub_fix
sub_fix( p_sub );
/* *** add subtitle ES *** */
vlc_mutex_lock( &p_input->stream.stream_lock );
p_sub->p_es = input_AddES( p_input,
p_input->stream.p_selected_program,
0xff, // FIXME
0 );
vlc_mutex_unlock( &p_input->stream.stream_lock );
p_sub->p_es->i_stream_id = 0xff; // FIXME
p_sub->p_es->i_fourcc = VLC_FOURCC( 's','u','b','t' );
p_sub->p_es->i_cat = SPU_ES;
p_sub->i_previously_selected = 0;
return( 0 );
}
/*****************************************************************************
* sub_demux: Send subtitle to decoder until i_maxdate
*****************************************************************************/
static int sub_demux( subtitle_demux_t *p_sub, mtime_t i_maxdate )
{
if( p_sub->p_es->p_decoder_fifo && !p_sub->i_previously_selected )
{
p_sub->i_previously_selected = 1;
p_sub->pf_seek( p_sub, i_maxdate );
return( 0 );
}
else if( !p_sub->p_es->p_decoder_fifo && p_sub->i_previously_selected )
{
p_sub->i_previously_selected = 0;
return( 0 );
}
while( p_sub->i_subtitle < p_sub->i_subtitles &&
p_sub->subtitle[p_sub->i_subtitle].i_start < i_maxdate )
{
pes_packet_t *p_pes;
data_packet_t *p_data;
int i_len;
i_len = strlen( p_sub->subtitle[p_sub->i_subtitle].psz_text ) + 1;
if( i_len <= 1 )
{
/* empty subtitle */
p_sub->i_subtitle++;
continue;
}
if( !( p_pes = input_NewPES( p_sub->p_input->p_method_data ) ) )
{
p_sub->i_subtitle++;
continue;
}
if( !( p_data = input_NewPacket( p_sub->p_input->p_method_data,
i_len ) ) )
{
input_DeletePES( p_sub->p_input->p_method_data, p_pes );
p_sub->i_subtitle++;
continue;
}
p_pes->i_pts =
input_ClockGetTS( p_sub->p_input,
p_sub->p_input->stream.p_selected_program,
p_sub->subtitle[p_sub->i_subtitle].i_start*9/100);
if( p_sub->subtitle[p_sub->i_subtitle].i_stop > 0 )
{
/* FIXME kludge ...
* i_dts means end of display...
*/
p_pes->i_dts =
input_ClockGetTS( p_sub->p_input,
p_sub->p_input->stream.p_selected_program,
p_sub->subtitle[p_sub->i_subtitle].i_stop *9/100);
}
else
{
p_pes->i_dts = 0;
}
p_pes->i_nb_data = 1;
p_pes->p_first =
p_pes->p_last = p_data;
p_pes->i_pes_size = i_len;
memcpy( p_data->p_payload_start,
p_sub->subtitle[p_sub->i_subtitle].psz_text,
i_len );
if( p_sub->p_es->p_decoder_fifo )
{
input_DecodePES( p_sub->p_es->p_decoder_fifo, p_pes );
}
else
{
input_DeletePES( p_sub->p_input->p_method_data, p_pes );
}
p_sub->i_subtitle++;
}
return( 0 );
}
/*****************************************************************************
* sub_seek: Seek to i_date
*****************************************************************************/
static int sub_seek ( subtitle_demux_t *p_sub, mtime_t i_date )
{
/* should be fast enough... */
p_sub->i_subtitle = 0;
while( p_sub->i_subtitle < p_sub->i_subtitles &&
p_sub->subtitle[p_sub->i_subtitle].i_start < i_date )
{
p_sub->i_subtitle++;