mirror of https://code.videolan.org/videolan/vlc
* 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 :)
This commit is contained in:
parent
d2d2e4f9d3
commit
aafd5b0dc7
|
@ -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
|
||||
|
||||
};
|
||||
|
||||
|
|
|
@ -1,2 +1,7 @@
|
|||
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
|
||||
|
||||
|
|
|
@ -0,0 +1,698 @@
|
|||
/*****************************************************************************
|
||||
* 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++;
|
||||
}
|
||||
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
/*****************************************************************************
|
||||
* sub_close: Close subtitle demux
|
||||
*****************************************************************************/
|
||||
static void sub_close( subtitle_demux_t *p_sub )
|
||||
{
|
||||
if( p_sub->subtitle )
|
||||
{
|
||||
int i;
|
||||
for( i = 0; i < p_sub->i_subtitles; i++ )
|
||||
{
|
||||
if( p_sub->subtitle[i].psz_text )
|
||||
{
|
||||
free( p_sub->subtitle[i].psz_text );
|
||||
}
|
||||
}
|
||||
free( p_sub->subtitle );
|
||||
}
|
||||
}
|
||||
/*****************************************************************************
|
||||
*
|
||||
* sub_fix: fix time stamp and order of subtitle
|
||||
*****************************************************************************/
|
||||
static void sub_fix( subtitle_demux_t *p_sub )
|
||||
{
|
||||
int i;
|
||||
mtime_t i_delay;
|
||||
int i_index;
|
||||
int i_done;
|
||||
|
||||
/* *** fix order (to be sure...) *** */
|
||||
/* We suppose that there are near in order and this durty bubble sort
|
||||
* wont take too much time
|
||||
*/
|
||||
do
|
||||
{
|
||||
i_done = 1;
|
||||
for( i_index = 1; i_index < p_sub->i_subtitles; i_index++ )
|
||||
{
|
||||
if( p_sub->subtitle[i_index].i_start <
|
||||
p_sub->subtitle[i_index - 1].i_start )
|
||||
{
|
||||
subtitle_t sub_xch;
|
||||
memcpy( &sub_xch,
|
||||
p_sub->subtitle + i_index - 1,
|
||||
sizeof( subtitle_t ) );
|
||||
memcpy( p_sub->subtitle + i_index - 1,
|
||||
p_sub->subtitle + i_index,
|
||||
sizeof( subtitle_t ) );
|
||||
memcpy( p_sub->subtitle + i_index,
|
||||
&sub_xch,
|
||||
sizeof( subtitle_t ) );
|
||||
i_done = 0;
|
||||
}
|
||||
}
|
||||
} while( !i_done );
|
||||
|
||||
|
||||
/* *** and at the end add delay *** */
|
||||
i_delay = (mtime_t)config_GetInt( p_sub, "sub-delay" ) * 100000;
|
||||
if( i_delay != 0 )
|
||||
{
|
||||
for( i = 0; i < p_sub->i_subtitles; i++ )
|
||||
{
|
||||
p_sub->subtitle[i].i_start += i_delay;
|
||||
p_sub->subtitle[i].i_stop += i_delay;
|
||||
if( p_sub->subtitle[i].i_start < 0 )
|
||||
{
|
||||
p_sub->i_subtitle = i + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* Specific Subtitle function
|
||||
*****************************************************************************/
|
||||
static int sub_MicroDvdRead( FILE *p_file, subtitle_t *p_subtitle, mtime_t i_microsecperframe)
|
||||
{
|
||||
/*
|
||||
* each line:
|
||||
* {n1}{n2}Line1|Line2|Line3....
|
||||
* where n1 and n2 are the video frame number...
|
||||
*
|
||||
*/
|
||||
char buffer[MAX_LINE + 1];
|
||||
char buffer_text[MAX_LINE + 1];
|
||||
uint32_t i_start;
|
||||
uint32_t i_stop;
|
||||
int i;
|
||||
|
||||
for( ;; )
|
||||
{
|
||||
if( fgets( buffer, MAX_LINE, p_file ) <= 0)
|
||||
{
|
||||
return( -1 );
|
||||
}
|
||||
i_start = 0;
|
||||
i_stop = 0;
|
||||
if( sscanf( buffer, "{%d}{}%[^\r\n]", &i_start, buffer_text ) == 2 ||
|
||||
sscanf( buffer, "{%d}{%d}%[^\r\n]", &i_start, &i_stop, buffer_text ) == 3)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* replace | by \n */
|
||||
for( i = 0; i < MAX_LINE; i++ )
|
||||
{
|
||||
if( buffer_text[i] == '|' )
|
||||
{
|
||||
buffer_text[i] = '\n';
|
||||
}
|
||||
}
|
||||
p_subtitle->i_start = (mtime_t)i_start * (mtime_t)i_microsecperframe;
|
||||
p_subtitle->i_stop = (mtime_t)i_stop * (mtime_t)i_microsecperframe;
|
||||
p_subtitle->psz_text = strdup( buffer_text );
|
||||
return( 0 );
|
||||
}
|
||||
|
||||
static int sub_SubRipRead( FILE *p_file, subtitle_t *p_subtitle, mtime_t i_microsecperframe )
|
||||
{
|
||||
/*
|
||||
* n
|
||||
* h1:m1:s1,d1 --> h2:m2:s2,d2
|
||||
* Line1
|
||||
* Line2
|
||||
* ...
|
||||
* [empty line]
|
||||
*
|
||||
*/
|
||||
char buffer[MAX_LINE + 1];
|
||||
char buffer_text[ 10 * MAX_LINE];
|
||||
int i_buffer_text;
|
||||
mtime_t i_start;
|
||||
mtime_t i_stop;
|
||||
|
||||
for( ;; )
|
||||
{
|
||||
int h1, m1, s1, d1, h2, m2, s2, d2;
|
||||
if( fgets( buffer, MAX_LINE, p_file ) <= 0)
|
||||
{
|
||||
return( -1 );
|
||||
}
|
||||
if( sscanf( buffer,
|
||||
"%d:%d:%d,%d --> %d:%d:%d,%d",
|
||||
&h1, &m1, &s1, &d1,
|
||||
&h2, &m2, &s2, &d2 ) == 8 )
|
||||
{
|
||||
i_start = ( (mtime_t)h1 * 3600*1000 +
|
||||
(mtime_t)m1 * 60*1000 +
|
||||
(mtime_t)s1 * 1000 +
|
||||
(mtime_t)d1 ) * 1000;
|
||||
|
||||
i_stop = ( (mtime_t)h2 * 3600*1000 +
|
||||
(mtime_t)m2 * 60*1000 +
|
||||
(mtime_t)s2 * 1000 +
|
||||
(mtime_t)d2 ) * 1000;
|
||||
|
||||
/* Now read text until an empty line */
|
||||
for( i_buffer_text = 0;; )
|
||||
{
|
||||
int i_len;
|
||||
if( fgets( buffer, MAX_LINE, p_file ) <= 0)
|
||||
{
|
||||
return( -1 );
|
||||
}
|
||||
i_len = strlen( buffer );
|
||||
if( i_len <= 1 ) // newline
|
||||
{
|
||||
buffer_text[__MAX( i_buffer_text - 1, 0 )] = '\0';
|
||||
p_subtitle->i_start = i_start;
|
||||
p_subtitle->i_stop = i_stop;
|
||||
p_subtitle->psz_text = strdup( buffer_text );
|
||||
return( 0 );
|
||||
}
|
||||
else
|
||||
{
|
||||
memcpy( buffer_text + i_buffer_text,
|
||||
buffer,
|
||||
i_len );
|
||||
i_buffer_text += i_len;
|
||||
buffer_text[i_buffer_text] = '\n';
|
||||
i_buffer_text++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
static int sub_SSARead( FILE *p_file, subtitle_t *p_subtitle, mtime_t i_microsecperframe, int i_comma_count )
|
||||
{
|
||||
char buffer[MAX_LINE + 1];
|
||||
char buffer_text[ 10 * MAX_LINE];
|
||||
char *p_buffer_text;
|
||||
mtime_t i_start;
|
||||
mtime_t i_stop;
|
||||
int i_comma;
|
||||
int i_text;
|
||||
|
||||
for( ;; )
|
||||
{
|
||||
int h1, m1, s1, c1, h2, m2, s2, c2;
|
||||
int i_dummy;
|
||||
if( fgets( buffer, MAX_LINE, p_file ) <= 0)
|
||||
{
|
||||
return( -1 );
|
||||
}
|
||||
if( sscanf( buffer,
|
||||
"Dialogue: Marked=%d,%d:%d:%d.%d,%d:%d:%d.%d,%[^\r\n]",
|
||||
&i_dummy,
|
||||
&h1, &m1, &s1, &c1,
|
||||
&h2, &m2, &s2, &c2,
|
||||
buffer_text ) == 10 )
|
||||
{
|
||||
i_start = ( (mtime_t)h1 * 3600*1000 +
|
||||
(mtime_t)m1 * 60*1000 +
|
||||
(mtime_t)s1 * 1000 +
|
||||
(mtime_t)c1 * 10 ) * 1000;
|
||||
|
||||
i_stop = ( (mtime_t)h2 * 3600*1000 +
|
||||
(mtime_t)m2 * 60*1000 +
|
||||
(mtime_t)s2 * 1000 +
|
||||
(mtime_t)c2 * 10 ) * 1000;
|
||||
|
||||
p_buffer_text = buffer_text;
|
||||
i_comma = 3;
|
||||
while( i_comma < i_comma_count &&
|
||||
*p_buffer_text != '\0' )
|
||||
{
|
||||
if( *p_buffer_text == ',' )
|
||||
{
|
||||
i_comma++;
|
||||
}
|
||||
p_buffer_text++;
|
||||
}
|
||||
p_subtitle->psz_text = malloc( strlen( p_buffer_text ) + 1);
|
||||
i_text = 0;
|
||||
while( *p_buffer_text )
|
||||
{
|
||||
if( *p_buffer_text == '\\' && ( *p_buffer_text =='n' || *p_buffer_text =='N' ) )
|
||||
{
|
||||
p_subtitle->psz_text[i_text] = '\n';
|
||||
i_text++;
|
||||
p_buffer_text += 2;
|
||||
}
|
||||
else if( *p_buffer_text == '{' && *p_buffer_text == '\\')
|
||||
{
|
||||
while( *p_buffer_text && *p_buffer_text != '}' )
|
||||
{
|
||||
p_buffer_text++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
p_subtitle->psz_text[i_text] = *p_buffer_text;
|
||||
i_text++;
|
||||
p_buffer_text++;
|
||||
}
|
||||
}
|
||||
p_subtitle->psz_text[i_text] = '\0';
|
||||
p_subtitle->i_start = i_start;
|
||||
p_subtitle->i_stop = i_stop;
|
||||
return( 0 );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int sub_SSA1Read( FILE *p_file, subtitle_t *p_subtitle, mtime_t i_microsecperframe )
|
||||
{
|
||||
return( sub_SSARead( p_file, p_subtitle, i_microsecperframe, 8 ) );
|
||||
}
|
||||
static int sub_SSA2_4Read( FILE *p_file, subtitle_t *p_subtitle, mtime_t i_microsecperframe )
|
||||
{
|
||||
return( sub_SSARead( p_file, p_subtitle, i_microsecperframe, 9 ) );
|
||||
}
|
||||
|
|
@ -0,0 +1,201 @@
|
|||
/*****************************************************************************
|
||||
* sub.h
|
||||
*****************************************************************************
|
||||
* Copyright (C) 2001 VideoLAN
|
||||
* $Id: sub.h,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.
|
||||
*****************************************************************************/
|
||||
|
||||
#define SUB_TYPE_MICRODVD 0x00
|
||||
#define SUB_TYPE_SUBRIP 0x01
|
||||
#define SUB_TYPE_SSA1 0x02
|
||||
#define SUB_TYPE_SSA2_4 0x03
|
||||
#define SUB_TYPE_UNKNOWN 0xffff
|
||||
|
||||
typedef struct subtitle_s
|
||||
{
|
||||
mtime_t i_start;
|
||||
mtime_t i_stop;
|
||||
|
||||
char *psz_text;
|
||||
} subtitle_t;
|
||||
|
||||
|
||||
typedef struct subtitle_demux_s
|
||||
{
|
||||
VLC_COMMON_MEMBERS
|
||||
|
||||
module_t *p_module;
|
||||
|
||||
int (*pf_open) ( struct subtitle_demux_s *p_sub,
|
||||
input_thread_t*p_input,
|
||||
char *psz_name,
|
||||
mtime_t i_microsecperframe );
|
||||
int (*pf_demux)( struct subtitle_demux_s *p_sub, mtime_t i_maxdate );
|
||||
int (*pf_seek) ( struct subtitle_demux_s *p_sub, mtime_t i_date );
|
||||
void (*pf_close)( struct subtitle_demux_s *p_sub );
|
||||
|
||||
|
||||
/* *** private *** */
|
||||
input_thread_t *p_input;
|
||||
int i_sub_type;
|
||||
|
||||
int i_previously_selected; // to make pf_seek
|
||||
es_descriptor_t *p_es;
|
||||
|
||||
int i_subtitle;
|
||||
int i_subtitles;
|
||||
subtitle_t *subtitle;
|
||||
|
||||
} subtitle_demux_t;
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* I made somes wrappers : So use them !
|
||||
* I think you shouldn't need access to subtitle_demux_t members else said
|
||||
* it to me.
|
||||
*
|
||||
*****************************************************************************/
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* subtitle_New: Start a new subtitle demux instance (but subtitle ES isn't
|
||||
* selected by default.
|
||||
*****************************************************************************
|
||||
* Return: NULL if failed, else a pointer on a new subtitle_demux_t.
|
||||
*
|
||||
* XXX: - if psz_name is NULL then --sub-file is read
|
||||
* - i_microsecperframe is used only for microdvd file. (overriden
|
||||
* by --sub-fps )
|
||||
* - it's at this point that --sub-delay is applied
|
||||
*
|
||||
*****************************************************************************/
|
||||
static inline subtitle_demux_t *subtitle_New( input_thread_t *p_input,
|
||||
char *psz_name,
|
||||
mtime_t i_microsecperframe );
|
||||
/*****************************************************************************
|
||||
* subtitle_Select: Select the related subtitle ES.
|
||||
*****************************************************************************/
|
||||
static inline void subtitle_Select( subtitle_demux_t *p_sub );
|
||||
|
||||
/*****************************************************************************
|
||||
* subtitle_Unselect: Unselect the related subtitle ES.
|
||||
*****************************************************************************/
|
||||
static inline void subtitle_Unselect( subtitle_demux_t *p_sub );
|
||||
|
||||
/*****************************************************************************
|
||||
* subtitle_Demux: send subtitle to decoder from last date to i_max
|
||||
*****************************************************************************/
|
||||
static inline int subtitle_Demux( subtitle_demux_t *p_sub, mtime_t i_max );
|
||||
|
||||
/*****************************************************************************
|
||||
* subtitle_Seek: Seek to i_date
|
||||
*****************************************************************************/
|
||||
static inline int subtitle_Seek( subtitle_demux_t *p_sub, mtime_t i_date );
|
||||
|
||||
/*****************************************************************************
|
||||
* subtitle_Close: Stop ES decoder and free all memory included p_sub.
|
||||
*****************************************************************************/
|
||||
static inline void subtitle_Close( subtitle_demux_t *p_sub );
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
|
||||
static inline
|
||||
subtitle_demux_t *subtitle_New( input_thread_t *p_input,
|
||||
char *psz_name,
|
||||
mtime_t i_microsecperframe )
|
||||
{
|
||||
subtitle_demux_t *p_sub;
|
||||
|
||||
p_sub = vlc_object_create( p_input, sizeof( subtitle_demux_t ) );
|
||||
p_sub->psz_object_name = "subtitle demux";
|
||||
p_sub->p_module = module_Need( p_sub, "subtitle demux", "" );
|
||||
|
||||
if( p_sub->p_module &&
|
||||
p_sub->pf_open( p_sub,
|
||||
p_input,
|
||||
psz_name,
|
||||
i_microsecperframe ) >=0 )
|
||||
{
|
||||
msg_Info( p_input, "subtitle started" );
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
msg_Err( p_input, "failed to start subtitle demux" );
|
||||
if( p_sub->p_module )
|
||||
{
|
||||
module_Unneed( p_sub, p_sub->p_module );
|
||||
}
|
||||
vlc_object_destroy( p_sub );
|
||||
p_sub = NULL;
|
||||
}
|
||||
|
||||
return( p_sub );
|
||||
}
|
||||
|
||||
static inline void subtitle_Select( subtitle_demux_t *p_sub )
|
||||
{
|
||||
if( p_sub && p_sub->p_es )
|
||||
{
|
||||
vlc_mutex_lock( &p_sub->p_input->stream.stream_lock );
|
||||
input_SelectES( p_sub->p_input, p_sub->p_es );
|
||||
vlc_mutex_unlock( &p_sub->p_input->stream.stream_lock );
|
||||
p_sub->i_previously_selected = 0;
|
||||
}
|
||||
}
|
||||
static inline void subtitle_Unselect( subtitle_demux_t *p_sub )
|
||||
{
|
||||
if( p_sub && p_sub->p_es )
|
||||
{
|
||||
vlc_mutex_lock( &p_sub->p_input->stream.stream_lock );
|
||||
input_UnselectES( p_sub->p_input, p_sub->p_es );
|
||||
vlc_mutex_unlock( &p_sub->p_input->stream.stream_lock );
|
||||
p_sub->i_previously_selected = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static inline int subtitle_Demux( subtitle_demux_t *p_sub, mtime_t i_max )
|
||||
{
|
||||
return( p_sub->pf_demux( p_sub, i_max ) );
|
||||
}
|
||||
|
||||
static inline int subtitle_Seek( subtitle_demux_t *p_sub, mtime_t i_date )
|
||||
{
|
||||
return( p_sub->pf_demux( p_sub, i_date ) );
|
||||
}
|
||||
|
||||
static inline void subtitle_Close( subtitle_demux_t *p_sub )
|
||||
{
|
||||
msg_Info( p_sub, "subtitle stopped" );
|
||||
if( p_sub->p_module )
|
||||
{
|
||||
module_Unneed( p_sub, p_sub->p_module );
|
||||
}
|
||||
if( p_sub )
|
||||
{
|
||||
vlc_object_destroy( p_sub );
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue