X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fsvcdsub.c;h=c47452e33a2a3aac327d19f90efd513bab713b7e;hb=21659d6907abfeeae475e276b595dabff63bf4f9;hp=cf4a3aa7ef9fc0e02af3a898e4564fffb48567c5;hpb=4f028428053d0342c55deb6ba8b8da114c6a0caa;p=vlc diff --git a/modules/codec/svcdsub.c b/modules/codec/svcdsub.c index cf4a3aa7ef..c47452e33a 100644 --- a/modules/codec/svcdsub.c +++ b/modules/codec/svcdsub.c @@ -27,10 +27,14 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include -#include -#include "vlc_bits.h" +#include /***************************************************************************** * Module descriptor. @@ -46,22 +50,22 @@ static void DecoderClose ( vlc_object_t * ); "calls 1\n" \ "packet assembly info 2\n" ) -vlc_module_begin(); - set_description( _("Philips OGT (SVCD subtitle) decoder") ); - set_shortname( _("SVCD subtitles") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_SCODEC ); - set_capability( "decoder", 50 ); - set_callbacks( DecoderOpen, DecoderClose ); +vlc_module_begin () + set_description( N_("Philips OGT (SVCD subtitle) decoder") ) + set_shortname( N_("SVCD subtitles") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_SCODEC ) + set_capability( "decoder", 50 ) + set_callbacks( DecoderOpen, DecoderClose ) add_integer ( MODULE_STRING "-debug", 0, NULL, - DEBUG_TEXT, DEBUG_LONGTEXT, VLC_TRUE ); + DEBUG_TEXT, DEBUG_LONGTEXT, true ) - add_submodule(); - set_description( _("Philips OGT (SVCD subtitle) packetizer") ); - set_capability( "packetizer", 50 ); - set_callbacks( PacketizerOpen, DecoderClose ); -vlc_module_end(); + add_submodule () + set_description( N_("Philips OGT (SVCD subtitle) packetizer") ) + set_capability( "packetizer", 50 ) + set_callbacks( PacketizerOpen, DecoderClose ) +vlc_module_end () /***************************************************************************** * Local prototypes @@ -109,15 +113,15 @@ struct decoder_sys_t uint16_t i_image; /* image number in the subtitle stream */ uint8_t i_packet; /* packet number for above image number */ - int i_spu_size; /* goal for subtitle_data_pos while gathering, + size_t i_spu_size; /* goal for subtitle_data_pos while gathering, size of used subtitle_data later */ uint16_t i_image_offset; /* offset from subtitle_data to compressed image data */ - int i_image_length; /* size of the compressed image data */ - int second_field_offset; /* offset of odd raster lines */ - int metadata_offset; /* offset to data describing the image */ - int metadata_length; /* length of metadata */ + size_t i_image_length; /* size of the compressed image data */ + size_t second_field_offset; /* offset of odd raster lines */ + size_t metadata_offset; /* offset to data describing the image */ + size_t metadata_length; /* length of metadata */ mtime_t i_duration; /* how long to display the image, 0 stands for "until next subtitle" */ @@ -137,20 +141,21 @@ 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( 'o','g','t',' ' ) ) - { + if( p_dec->fmt_in.i_codec != VLC_CODEC_OGT ) return VLC_EGENERIC; - } p_dec->p_sys = p_sys = calloc( 1, sizeof( decoder_sys_t ) ); - p_sys->i_debug = config_GetInt( p_this, MODULE_STRING "-debug" ); + if( p_sys == NULL ) + return VLC_ENOMEM; + + p_sys->i_debug = var_InheritInteger( p_this, MODULE_STRING "-debug" ); - p_sys->i_image = -1; + p_sys->i_image = -1; p_sys->i_state = SUBTITLE_BLOCK_EMPTY; p_sys->p_spu = NULL; - es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_FOURCC( 'o','g','t',' ' ) ); + es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_CODEC_OGT ); p_dec->pf_decode_sub = Decode; p_dec->pf_packetize = Packetize; @@ -254,9 +259,15 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block ) uint16_t i_expected_image; uint8_t i_packet, i_expected_packet; + if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) + { + block_Release( p_block ); + return NULL; + } + 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; @@ -264,34 +275,6 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block ) p_buffer = p_block->p_buffer; - /* Attach to our input thread and see if subtitle is selected. */ - { - vlc_object_t * p_input; - vlc_value_t val; - - p_input = vlc_object_find( p_dec, VLC_OBJECT_INPUT, FIND_PARENT ); - - if( !p_input ) return NULL; - - if( var_Get( p_input, "sub-track", &val ) ) - { - vlc_object_release( p_input ); - return NULL; - } - - vlc_object_release( p_input ); - dbg_print( (DECODE_DBG_PACKET), - "val.i_int %x p_buffer[i] %x", val.i_int, p_buffer[1]); - - /* The dummy ES that the menu selection uses has an 0x70 at - the head which we need to strip off. */ - if( val.i_int == -1 || (val.i_int & 0x03) != p_buffer[1] ) - { - dbg_print( DECODE_DBG_PACKET, "subtitle not for us.\n"); - return NULL; - } - } - if( p_sys->i_state == SUBTITLE_BLOCK_EMPTY ) { i_expected_image = p_sys->i_image + 1; @@ -303,6 +286,8 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block ) i_expected_packet = p_sys->i_packet + 1; } + /* The dummy ES that the menu selection uses has an 0x70 at + the head which we need to strip off. */ p_buffer += 2; if( *p_buffer & 0x80 ) @@ -345,12 +330,12 @@ 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, "subtitle packets size=%d should be %d", + msg_Warn( p_dec, "subtitle packets size=%zu should be %zu", p_spu->i_buffer, p_sys->i_spu_size ); } dbg_print( (DECODE_DBG_PACKET), - "subtitle packet complete, size=%d", p_spu->i_buffer ); + "subtitle packet complete, size=%zu", p_spu->i_buffer ); p_sys->i_state = SUBTITLE_BLOCK_EMPTY; p_sys->p_spu = 0; @@ -429,15 +414,15 @@ static void ParseHeader( decoder_t *p_dec, block_t *p_block ) p_sys->i_image_length = p_sys->i_spu_size - p_sys->i_image_offset; p_sys->metadata_length = p_sys->i_image_offset; - if (p_sys && p_sys->i_debug & DECODE_DBG_PACKET) + if( p_sys->i_debug & DECODE_DBG_PACKET ) { msg_Dbg( p_dec, "x-start: %d, y-start: %d, width: %d, height %d, " - "spu size: %d, duration: %lu (d:%d p:%d)", + "spu size: %zu, duration: %"PRIu64" (d:%zu p:%"PRIu16")", p_sys->i_x_start, p_sys->i_y_start, p_sys->i_width, p_sys->i_height, - p_sys->i_spu_size, (long unsigned int) p_sys->i_duration, + p_sys->i_spu_size, p_sys->i_duration, p_sys->i_image_length, p_sys->i_image_offset); - + for( i = 0; i < 4; i++ ) { msg_Dbg( p_dec, "palette[%d]= T: %2x, Y: %2x, u: %2x, v: %2x", i, @@ -459,23 +444,20 @@ 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 = VLC_TRUE; - - p_spu->i_x = p_sys->i_x_start; - 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 = VLC_TRUE; + p_spu->b_ephemer = true; /* Create new subtitle region */ memset( &fmt, 0, sizeof(video_format_t) ); - fmt.i_chroma = VLC_FOURCC('Y','U','V','P'); + fmt.i_chroma = VLC_CODEC_YUVP; /** The video on which the subtitle sits, is scaled, probably @@ -485,24 +467,13 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, block_t *p_data ) Two candidates are the video and the other possibility would be the access module. */ - fmt.i_aspect = VOUT_ASPECT_FACTOR; + fmt.i_sar_num = p_sys->i_height; + fmt.i_sar_den = p_sys->i_width; 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 SVCD subtitle region" ); - //goto error; - } - - p_region->fmt.i_aspect = VOUT_ASPECT_FACTOR; - - 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++ ) { @@ -512,6 +483,18 @@ 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 SVCD subtitle 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_y = p_sys->i_y_start; + SVCDSubRenderImage( p_dec, p_data, p_region ); return p_spu; @@ -539,7 +522,7 @@ static void SVCDSubRenderImage( 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; @@ -558,13 +541,13 @@ static void SVCDSubRenderImage( decoder_t *p_dec, block_t *p_data, if( i_color == 0 && (i_count = bs_read( &bs, 2 )) ) { 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], 0, i_count + 1 ); i_column += i_count; continue; } - p_dest[i_row * p_region->picture.Y_PITCH + i_column] = i_color; + p_dest[i_row * p_region->p_picture->Y_PITCH + i_column] = i_color; } bs_align( &bs );