Commit fabc3dad authored by Jean-Paul Saman's avatar Jean-Paul Saman

Init decoder fmt_out structure, so it can be used in transcoding loop.

parent 0f0e2498
...@@ -194,6 +194,12 @@ static int Open( vlc_object_t *p_this ) ...@@ -194,6 +194,12 @@ static int Open( vlc_object_t *p_this )
p_sys->b_text = var_CreateGetBool( p_dec, "vbi-text" ); p_sys->b_text = var_CreateGetBool( p_dec, "vbi-text" );
// var_AddCallback( p_dec, "vbi-text", Text, p_sys ); // var_AddCallback( p_dec, "vbi-text", Text, p_sys );
es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) );
if( p_sys->b_text )
p_dec->fmt_out.video.i_chroma = VLC_FOURCC('T','E','X','T');
else
p_dec->fmt_out.video.i_chroma = VLC_FOURCC('R','G','B','A');
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -304,7 +310,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block ) ...@@ -304,7 +310,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
/* Normal text subs, easy markup */ /* Normal text subs, easy markup */
p_spu->i_flags = SUBPICTURE_ALIGN_BOTTOM; p_spu->i_flags = SUBPICTURE_ALIGN_BOTTOM;
p_spu->i_start = p_block->i_pts; p_spu->i_start = (mtime_t) p_block->i_pts;
p_spu->i_stop = (mtime_t) 0; p_spu->i_stop = (mtime_t) 0;
p_spu->b_ephemer = VLC_TRUE; p_spu->b_ephemer = VLC_TRUE;
p_spu->b_absolute = VLC_FALSE; p_spu->b_absolute = VLC_FALSE;
...@@ -316,7 +322,8 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block ) ...@@ -316,7 +322,8 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
if( p_sys->b_text ) if( p_sys->b_text )
{ {
unsigned int i_total, i_textsize = 7000; unsigned int i_textsize = 7000;
int i_total;
char p_text[7000]; char p_text[7000];
i_total = vbi_print_page_region( &p_page, p_text, i_textsize, i_total = vbi_print_page_region( &p_page, p_text, i_textsize,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment