X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fcvdsub.c;h=9406db5d3ab8f9374d7b277237a5a8730e8e6f58;hb=41b8c2e1f660c767ee7a96ab69204b94b1470ca8;hp=85ff2548c2d53433fe5fd9fc22efd86460241b8f;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc diff --git a/modules/codec/cvdsub.c b/modules/codec/cvdsub.c index 85ff2548c2..9406db5d3a 100644 --- a/modules/codec/cvdsub.c +++ b/modules/codec/cvdsub.c @@ -31,11 +31,11 @@ # include "config.h" #endif -#include -#include +#include +#include #include -#include "vlc_bits.h" +#include #define DEBUG_CVDSUB 1 @@ -46,16 +46,16 @@ static int DecoderOpen ( vlc_object_t * ); static int PacketizerOpen( vlc_object_t * ); static void DecoderClose ( vlc_object_t * ); -vlc_module_begin(); - set_description( _("CVD subtitle decoder") ); - set_capability( "decoder", 50 ); - set_callbacks( DecoderOpen, DecoderClose ); +vlc_module_begin () + set_description( N_("CVD subtitle decoder") ) + set_capability( "decoder", 50 ) + set_callbacks( DecoderOpen, DecoderClose ) - add_submodule(); - set_description( _("Chaoji VCD subtitle packetizer") ); - set_capability( "packetizer", 50 ); - set_callbacks( PacketizerOpen, DecoderClose ); -vlc_module_end(); + add_submodule () + set_description( N_("Chaoji VCD subtitle packetizer") ) + set_capability( "packetizer", 50 ) + set_callbacks( PacketizerOpen, DecoderClose ) +vlc_module_end () /***************************************************************************** * Local prototypes @@ -110,23 +110,24 @@ static int DecoderOpen( vlc_object_t *p_this ) decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; - if( p_dec->fmt_in.i_codec != VLC_FOURCC( 'c','v','d',' ' ) ) - { + if( p_dec->fmt_in.i_codec != VLC_CODEC_CVD ) return VLC_EGENERIC; - } p_dec->p_sys = p_sys = malloc( sizeof( decoder_sys_t ) ); + if( !p_sys ) + return VLC_ENOMEM; p_sys->b_packetizer = false; p_sys->i_state = SUBTITLE_BLOCK_EMPTY; p_sys->p_spu = NULL; - es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_FOURCC( 'c','v','d',' ' ) ); - p_dec->pf_decode_sub = Decode; p_dec->pf_packetize = Packetize; + p_dec->fmt_out.i_cat = SPU_ES; + p_dec->fmt_out.i_codec = VLC_CODEC_YUVP; + return VLC_SUCCESS; } @@ -217,7 +218,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block ) if( p_block->i_buffer < SPU_HEADER_LEN ) { - msg_Dbg( p_dec, "invalid packet header (size %d < %d)" , + msg_Dbg( p_dec, "invalid packet header (size %zu < %u)" , p_block->i_buffer, SPU_HEADER_LEN ); block_Release( p_block ); return NULL; @@ -229,7 +230,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block ) * to detect the first packet in a subtitle. The first packet * seems to have a valid PTS while later packets for the same * image don't. */ - if( p_sys->i_state == SUBTITLE_BLOCK_EMPTY && p_block->i_pts == 0 ) + if( p_sys->i_state == SUBTITLE_BLOCK_EMPTY && p_block->i_pts <= VLC_TS_INVALID ) { msg_Warn( p_dec, "first packet expected but no PTS present"); return NULL; @@ -250,11 +251,11 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block ) if( p_spu->i_buffer != p_sys->i_spu_size ) { - msg_Warn( p_dec, "SPU packets size=%d should be %d", + msg_Warn( p_dec, "SPU packets size=%zu should be %zu", p_spu->i_buffer, p_sys->i_spu_size ); } - msg_Dbg( p_dec, "subtitle packet complete, size=%d", p_spu->i_buffer); + msg_Dbg( p_dec, "subtitle packet complete, size=%zuu", p_spu->i_buffer); ParseMetaInfo( p_dec, p_spu ); @@ -312,7 +313,7 @@ static void ParseHeader( decoder_t *p_dec, block_t *p_block ) p_sys->i_image_length = p_sys->metadata_offset - p_sys->i_image_offset; #ifdef DEBUG_CVDSUB - msg_Dbg( p_dec, "total size: %d image size: %d", + msg_Dbg( p_dec, "total size: %zu image size: %zu", p_sys->i_spu_size, p_sys->i_image_length ); #endif } @@ -458,7 +459,8 @@ static void ParseMetaInfo( decoder_t *p_dec, block_t *p_spu ) p_sys->first_field_offset = (p[2] << 8) + p[3] - p_sys->i_image_offset; #ifdef DEBUG_CVDSUB - msg_Dbg( p_dec, "1st_field_offset %d", p_sys->first_field_offset ); + msg_Dbg( p_dec, "1st_field_offset %zu", + p_sys->first_field_offset ); #endif break; @@ -468,7 +470,8 @@ static void ParseMetaInfo( decoder_t *p_dec, block_t *p_spu ) p_sys->second_field_offset = (p[2] << 8) + p[3] - p_sys->i_image_offset; #ifdef DEBUG_CVDSUB - msg_Dbg( p_dec, "2nd_field_offset %d", p_sys->second_field_offset); + msg_Dbg( p_dec, "2nd_field_offset %zu", + p_sys->second_field_offset); #endif break; @@ -493,39 +496,26 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, block_t *p_data ) subpicture_t *p_spu; subpicture_region_t *p_region; video_format_t fmt; + video_palette_t palette; int i; /* Allocate the subpicture internal data. */ - p_spu = p_dec->pf_spu_buffer_new( p_dec ); + p_spu = decoder_NewSubpicture( p_dec, NULL ); if( !p_spu ) return NULL; - p_spu->b_pausable = true; - - p_spu->i_x = p_sys->i_x_start; - p_spu->i_x = p_spu->i_x * 3 / 4; /* FIXME: use aspect ratio for x? */ - p_spu->i_y = p_sys->i_y_start; p_spu->i_start = p_data->i_pts; p_spu->i_stop = p_data->i_pts + p_sys->i_duration; p_spu->b_ephemer = true; /* Create new SPU region */ memset( &fmt, 0, sizeof(video_format_t) ); - fmt.i_chroma = VLC_FOURCC('Y','U','V','P'); - fmt.i_aspect = VOUT_ASPECT_FACTOR; + fmt.i_chroma = VLC_CODEC_YUVP; + fmt.i_sar_num = 1; + fmt.i_sar_den = 1; fmt.i_width = fmt.i_visible_width = p_sys->i_width; fmt.i_height = fmt.i_visible_height = p_sys->i_height; fmt.i_x_offset = fmt.i_y_offset = 0; - p_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt ); - if( !p_region ) - { - msg_Err( p_dec, "cannot allocate SPU region" ); - //goto error; - } - - p_spu->p_region = p_region; - p_region->i_x = p_region->i_y = 0; - - /* Build palette */ + fmt.p_palette = &palette; fmt.p_palette->i_entries = 4; for( i = 0; i < fmt.p_palette->i_entries; i++ ) { @@ -535,6 +525,19 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, block_t *p_data ) fmt.p_palette->palette[i][3] = p_sys->p_palette[i][3]; } + p_region = subpicture_region_New( &fmt ); + if( !p_region ) + { + msg_Err( p_dec, "cannot allocate SPU region" ); + decoder_DeleteSubpicture( p_dec, p_spu ); + return NULL; + } + + p_spu->p_region = p_region; + p_region->i_x = p_sys->i_x_start; + p_region->i_x = p_region->i_x * 3 / 4; /* FIXME: use aspect ratio for x? */ + p_region->i_y = p_sys->i_y_start; + RenderImage( p_dec, p_data, p_region ); return p_spu; @@ -567,7 +570,7 @@ static void RenderImage( decoder_t *p_dec, block_t *p_data, subpicture_region_t *p_region ) { decoder_sys_t *p_sys = p_dec->p_sys; - uint8_t *p_dest = p_region->picture.Y_PIXELS; + uint8_t *p_dest = p_region->p_picture->Y_PIXELS; int i_field; /* The subtitles are interlaced */ int i_row, i_column; /* scanline row/column number */ uint8_t i_color, i_count; @@ -589,7 +592,7 @@ static void RenderImage( decoder_t *p_dec, block_t *p_data, /* Fill the rest of the line with next color */ i_color = bs_read( &bs, 4 ); - memset( &p_dest[i_row * p_region->picture.Y_PITCH + + memset( &p_dest[i_row * p_region->p_picture->Y_PITCH + i_column], i_color, p_sys->i_width - i_column ); i_column = p_sys->i_width; @@ -603,7 +606,7 @@ static void RenderImage( decoder_t *p_dec, block_t *p_data, i_count = __MIN( i_count, p_sys->i_width - i_column ); - memset( &p_dest[i_row * p_region->picture.Y_PITCH + + memset( &p_dest[i_row * p_region->p_picture->Y_PITCH + i_column], i_color, i_count ); i_column += i_count - 1; continue;