X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fspudec%2Fparse.c;h=f2c404faaccd0dc3ccca024f9ddf6b4f8b0dc691;hb=f0c76d5063ea5929f8b514e3bc5b0681cdf8d35e;hp=ca35396551294f60bcbc5fc2a90d6c014f20a0c2;hpb=a02a027f5ea3993d4087b0933b24c8b3a9f375b2;p=vlc diff --git a/modules/codec/spudec/parse.c b/modules/codec/spudec/parse.c index ca35396551..f2c404faac 100644 --- a/modules/codec/spudec/parse.c +++ b/modules/codec/spudec/parse.c @@ -1,10 +1,10 @@ /***************************************************************************** * parse.c: SPU parser ***************************************************************************** - * Copyright (C) 2000-2001 VideoLAN + * Copyright (C) 2000-2001, 2005, 2006 the VideoLAN team * $Id$ * - * Authors: Samuel Hocevar + * Authors: Sam Hocevar * Laurent Aimar * Gildas Bazin * @@ -20,30 +20,46 @@ * * 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. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include #include "spudec.h" /***************************************************************************** * Local prototypes. *****************************************************************************/ -static int ParseControlSeq( decoder_t *, subpicture_t *, subpicture_data_t *); -static int ParseRLE ( decoder_t *, subpicture_t *, subpicture_data_t *); -static void Render ( decoder_t *, subpicture_t *, subpicture_data_t *); +typedef struct +{ + int i_width; + int i_height; + int i_x; + int i_y; +} spu_properties_t; + +static int ParseControlSeq( decoder_t *, subpicture_t *, subpicture_data_t *, + spu_properties_t * ); +static int ParseRLE ( decoder_t *, subpicture_data_t *, + const spu_properties_t * ); +static void Render ( decoder_t *, subpicture_t *, subpicture_data_t *, + const spu_properties_t * ); /***************************************************************************** * AddNibble: read a nibble from a source packet and add it to our integer. *****************************************************************************/ static inline unsigned int AddNibble( unsigned int i_code, - uint8_t *p_src, int *pi_index ) + uint8_t *p_src, unsigned int *pi_index ) { if( *pi_index & 0x1 ) { @@ -61,11 +77,12 @@ static inline unsigned int AddNibble( unsigned int i_code, * This function parses the SPU packet and, if valid, sends it to the * video output. *****************************************************************************/ -subpicture_t * E_(ParsePacket)( decoder_t *p_dec ) +subpicture_t * ParsePacket( decoder_t *p_dec ) { decoder_sys_t *p_sys = p_dec->p_sys; subpicture_data_t *p_spu_data; subpicture_t *p_spu; + spu_properties_t spu_properties; /* Allocate the subpicture internal data. */ p_spu = p_dec->pf_spu_buffer_new( p_dec ); @@ -77,8 +94,8 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec ) * this stupid interlacing stuff once. */ p_spu_data = malloc( sizeof(subpicture_data_t) + 4 * p_sys->i_rle_size ); p_spu_data->p_data = (uint8_t *)p_spu_data + sizeof(subpicture_data_t); - p_spu_data->b_palette = VLC_FALSE; - p_spu_data->b_auto_crop = VLC_FALSE; + p_spu_data->b_palette = false; + p_spu_data->b_auto_crop = false; p_spu_data->i_y_top_offset = 0; p_spu_data->i_y_bottom_offset = 0; @@ -95,8 +112,10 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec ) p_spu->i_original_picture_height = p_dec->fmt_in.subs.spu.i_original_frame_height; + memset( &spu_properties, 0, sizeof(spu_properties) ); + /* Getting the control part */ - if( ParseControlSeq( p_dec, p_spu, p_spu_data ) ) + if( ParseControlSeq( p_dec, p_spu, p_spu_data, &spu_properties ) ) { /* There was a parse error, delete the subpicture */ p_dec->pf_spu_buffer_del( p_dec, p_spu ); @@ -104,18 +123,20 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec ) } /* We try to display it */ - if( ParseRLE( p_dec, p_spu, p_spu_data ) ) + if( ParseRLE( p_dec, p_spu_data, &spu_properties ) ) { /* There was a parse error, delete the subpicture */ p_dec->pf_spu_buffer_del( p_dec, p_spu ); return NULL; } +#ifdef DEBUG_SPUDEC msg_Dbg( p_dec, "total size: 0x%x, RLE offsets: 0x%x 0x%x", p_sys->i_spu_size, p_spu_data->pi_offset[0], p_spu_data->pi_offset[1] ); +#endif - Render( p_dec, p_spu, p_spu_data ); + Render( p_dec, p_spu, p_spu_data, &spu_properties ); free( p_spu_data ); return p_spu; @@ -129,7 +150,7 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec ) * subtitles format, see http://sam.zoy.org/doc/dvd/subtitles/index.html *****************************************************************************/ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu, - subpicture_data_t *p_spu_data ) + subpicture_data_t *p_spu_data, spu_properties_t *p_spu_properties ) { decoder_sys_t *p_sys = p_dec->p_sys; @@ -143,72 +164,84 @@ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu, uint8_t i_command = SPU_CMD_END; mtime_t date = 0; - unsigned int i, pi_alpha[4]; + if( !p_spu || !p_spu_data ) + return VLC_EGENERIC; /* Initialize the structure */ p_spu->i_start = p_spu->i_stop = 0; - p_spu->b_ephemer = VLC_FALSE; + p_spu->b_ephemer = false; - do + for( i_index = 4 + p_sys->i_rle_size; i_index < p_sys->i_spu_size ; ) { - if( (int)i_index >= p_sys->i_spu_size + 1 ) - { - /* sanity - * XXX only on test by loop as p_sys->buffer is bigger than needed - * to avoid checking at each access - */ - break; - } - /* If we just read a command sequence, read the next one; * otherwise, go on with the commands of the current sequence. */ if( i_command == SPU_CMD_END ) { + if( i_index + 4 > p_sys->i_spu_size ) + { + msg_Err( p_dec, "overflow in SPU command sequence" ); + return VLC_EGENERIC; + } + /* Get the control sequence date */ date = (mtime_t)GetWBE( &p_sys->buffer[i_index] ) * 11000; - /* FIXME How to access i_rate - * p_spudec->bit_stream.p_pes->i_rate / DEFAULT_RATE; - */ + if( p_sys->i_rate ) + date = date * p_sys->i_rate / INPUT_RATE_DEFAULT; /* Next offset */ i_cur_seq = i_index; i_next_seq = GetWBE( &p_sys->buffer[i_index+2] ); + if( i_next_seq > p_sys->i_spu_size ) + { + msg_Err( p_dec, "overflow in SPU next command sequence" ); + return VLC_EGENERIC; + } + /* Skip what we just read */ i_index += 4; } - i_command = p_sys->buffer[i_index++]; + i_command = p_sys->buffer[i_index]; switch( i_command ) { case SPU_CMD_FORCE_DISPLAY: /* 00 (force displaying) */ p_spu->i_start = p_spu_data->i_pts + date; - p_spu->b_ephemer = VLC_TRUE; + p_spu->b_ephemer = true; + i_index += 1; break; /* Convert the dates in seconds to PTS values */ case SPU_CMD_START_DISPLAY: /* 01 (start displaying) */ p_spu->i_start = p_spu_data->i_pts + date; + i_index += 1; break; case SPU_CMD_STOP_DISPLAY: /* 02 (stop displaying) */ p_spu->i_stop = p_spu_data->i_pts + date; + i_index += 1; break; case SPU_CMD_SET_PALETTE: - /* 03xxxx (palette) */ + if( i_index + 3 > p_sys->i_spu_size ) + { + msg_Err( p_dec, "overflow in SPU command" ); + return VLC_EGENERIC; + } + if( p_dec->fmt_in.subs.spu.palette[0] == 0xBeeF ) { unsigned int idx[4]; + int i; - p_spu_data->b_palette = VLC_TRUE; + p_spu_data->b_palette = true; - idx[0] = (p_sys->buffer[i_index+0]>>4)&0x0f; - idx[1] = (p_sys->buffer[i_index+0])&0x0f; - idx[2] = (p_sys->buffer[i_index+1]>>4)&0x0f; - idx[3] = (p_sys->buffer[i_index+1])&0x0f; + idx[0] = (p_sys->buffer[i_index+1]>>4)&0x0f; + idx[1] = (p_sys->buffer[i_index+1])&0x0f; + idx[2] = (p_sys->buffer[i_index+2]>>4)&0x0f; + idx[3] = (p_sys->buffer[i_index+2])&0x0f; for( i = 0; i < 4 ; i++ ) { @@ -220,72 +253,102 @@ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu, p_spu_data->pi_yuv[3-i][2] = (i_color>>8) & 0xff; } } - i_index += 2; + i_index += 3; break; case SPU_CMD_SET_ALPHACHANNEL: /* 04xxxx (alpha channel) */ - pi_alpha[3] = (p_sys->buffer[i_index+0]>>4)&0x0f; - pi_alpha[2] = (p_sys->buffer[i_index+0])&0x0f; - pi_alpha[1] = (p_sys->buffer[i_index+1]>>4)&0x0f; - pi_alpha[0] = (p_sys->buffer[i_index+1])&0x0f; - - /* Ignore blank alpha palette. Sometimes spurious blank - * alpha palettes are present - dunno why. */ - if( pi_alpha[0] | pi_alpha[1] | pi_alpha[2] | pi_alpha[3] ) - { - p_spu_data->pi_alpha[0] = pi_alpha[0]; - p_spu_data->pi_alpha[1] = pi_alpha[1]; - p_spu_data->pi_alpha[2] = pi_alpha[2]; - p_spu_data->pi_alpha[3] = pi_alpha[3]; - } - else + if( i_index + 3 > p_sys->i_spu_size ) { - msg_Warn( p_dec, "ignoring blank alpha palette" ); + msg_Err( p_dec, "overflow in SPU command" ); + return VLC_EGENERIC; } - i_index += 2; + p_spu_data->pi_alpha[3] = (p_sys->buffer[i_index+1]>>4)&0x0f; + p_spu_data->pi_alpha[2] = (p_sys->buffer[i_index+1])&0x0f; + p_spu_data->pi_alpha[1] = (p_sys->buffer[i_index+2]>>4)&0x0f; + p_spu_data->pi_alpha[0] = (p_sys->buffer[i_index+2])&0x0f; + + i_index += 3; break; case SPU_CMD_SET_COORDINATES: /* 05xxxyyyxxxyyy (coordinates) */ - p_spu->i_x = (p_sys->buffer[i_index+0]<<4)| - ((p_sys->buffer[i_index+1]>>4)&0x0f); - p_spu->i_width = (((p_sys->buffer[i_index+1]&0x0f)<<8)| - p_sys->buffer[i_index+2]) - p_spu->i_x + 1; + if( i_index + 7 > p_sys->i_spu_size ) + { + msg_Err( p_dec, "overflow in SPU command" ); + return VLC_EGENERIC; + } + + p_spu_properties->i_x = (p_sys->buffer[i_index+1]<<4)| + ((p_sys->buffer[i_index+2]>>4)&0x0f); + p_spu_properties->i_width = (((p_sys->buffer[i_index+2]&0x0f)<<8)| + p_sys->buffer[i_index+3]) - p_spu_properties->i_x + 1; - p_spu->i_y = (p_sys->buffer[i_index+3]<<4)| - ((p_sys->buffer[i_index+4]>>4)&0x0f); - p_spu->i_height = (((p_sys->buffer[i_index+4]&0x0f)<<8)| - p_sys->buffer[i_index+5]) - p_spu->i_y + 1; + p_spu_properties->i_y = (p_sys->buffer[i_index+4]<<4)| + ((p_sys->buffer[i_index+5]>>4)&0x0f); + p_spu_properties->i_height = (((p_sys->buffer[i_index+5]&0x0f)<<8)| + p_sys->buffer[i_index+6]) - p_spu_properties->i_y + 1; /* Auto crop fullscreen subtitles */ - if( p_spu->i_height > 250 ) - p_spu_data->b_auto_crop = VLC_TRUE; + if( p_spu_properties->i_height > 250 ) + p_spu_data->b_auto_crop = true; - i_index += 6; + i_index += 7; break; case SPU_CMD_SET_OFFSETS: /* 06xxxxyyyy (byte offsets) */ - p_spu_data->pi_offset[0] = GetWBE(&p_sys->buffer[i_index+0]) - 4; - p_spu_data->pi_offset[1] = GetWBE(&p_sys->buffer[i_index+2]) - 4; - i_index += 4; + if( i_index + 5 > p_sys->i_spu_size ) + { + msg_Err( p_dec, "overflow in SPU command" ); + return VLC_EGENERIC; + } + + p_spu_data->pi_offset[0] = GetWBE(&p_sys->buffer[i_index+1]) - 4; + p_spu_data->pi_offset[1] = GetWBE(&p_sys->buffer[i_index+3]) - 4; + i_index += 5; break; case SPU_CMD_END: /* ff (end) */ + i_index += 1; break; default: /* xx (unknown command) */ - msg_Warn( p_dec, "unknown command 0x%.2x", i_command ); - return VLC_EGENERIC; + msg_Warn( p_dec, "unknown SPU command 0x%.2x", i_command ); + if( i_index + 1 < i_next_seq ) + { + /* There is at least one other command sequence */ + if( p_sys->buffer[i_next_seq - 1] == SPU_CMD_END ) + { + /* This is consistent. Skip to that command sequence. */ + i_index = i_next_seq; + } + else + { + /* There were other commands. */ + msg_Warn( p_dec, "cannot recover, dropping subtitle" ); + return VLC_EGENERIC; + } + } + else + { + /* We were in the last command sequence. Stop parsing by + * pretending we met an SPU_CMD_END command. */ + i_command = SPU_CMD_END; + i_index++; + } } /* We need to check for quit commands here */ - if( p_dec->b_die ) + if( !vlc_object_alive (p_dec) ) { return VLC_EGENERIC; } - } while( i_command != SPU_CMD_END || i_index == i_next_seq ); + if( i_command == SPU_CMD_END && i_index != i_next_seq ) + { + break; + } + } /* Check that the next sequence index matches the current one */ if( i_next_seq != i_cur_seq ) @@ -295,7 +358,7 @@ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu, return VLC_EGENERIC; } - if( (int)i_index > p_sys->i_spu_size ) + if( i_index > p_sys->i_spu_size ) { msg_Err( p_dec, "uh-oh, we went too far (0x%.4x > 0x%.4x)", i_index, p_sys->i_spu_size ); @@ -305,21 +368,22 @@ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu, if( !p_spu->i_start ) { msg_Err( p_dec, "no `start display' command" ); + return VLC_EGENERIC; } if( p_spu->i_stop <= p_spu->i_start && !p_spu->b_ephemer ) { /* This subtitle will live for 5 seconds or until the next subtitle */ p_spu->i_stop = p_spu->i_start + (mtime_t)500 * 11000; - p_spu->b_ephemer = VLC_TRUE; + p_spu->b_ephemer = true; } /* Get rid of padding bytes */ - if( p_sys->i_spu_size > (int)i_index + 1 ) + if( p_sys->i_spu_size > i_index + 1 ) { - /* Zero or one padding byte, are quite usual + /* Zero or one padding byte are quite usual * More than one padding byte - this is very strange, but - * we can deal with it */ + * we can ignore them. */ msg_Warn( p_dec, "%i padding bytes, we usually get 0 or 1 of them", p_sys->i_spu_size - i_index ); } @@ -335,16 +399,17 @@ static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu, * convenient structure for later decoding. For more information on the * subtitles format, see http://sam.zoy.org/doc/dvd/subtitles/index.html *****************************************************************************/ -static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu, - subpicture_data_t *p_spu_data ) +static int ParseRLE( decoder_t *p_dec, + subpicture_data_t *p_spu_data, + const spu_properties_t *p_spu_properties ) { decoder_sys_t *p_sys = p_dec->p_sys; uint8_t *p_src = &p_sys->buffer[4]; unsigned int i_code; - unsigned int i_width = p_spu->i_width; - unsigned int i_height = p_spu->i_height; + unsigned int i_width = p_spu_properties->i_width; + unsigned int i_height = p_spu_properties->i_height; unsigned int i_x, i_y; uint16_t *p_dest = (uint16_t *)p_spu_data->p_data; @@ -355,7 +420,7 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu, unsigned int *pi_offset; /* Cropping */ - vlc_bool_t b_empty_top = VLC_TRUE; + bool b_empty_top = true; unsigned int i_skipped_top = 0, i_skipped_bottom = 0; unsigned int i_transparent_code = 0; @@ -435,7 +500,7 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu, } else { - p_spu_data->b_auto_crop = VLC_FALSE; + p_spu_data->b_auto_crop = false; } } @@ -460,7 +525,7 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu, *p_dest++ = i_code; /* Valid code means no blank line */ - b_empty_top = VLC_FALSE; + b_empty_top = false; i_skipped_bottom = 0; } } @@ -504,19 +569,24 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu, return VLC_EGENERIC; } +#ifdef DEBUG_SPUDEC msg_Dbg( p_dec, "valid subtitle, size: %ix%i, position: %i,%i", p_spu->i_width, p_spu->i_height, p_spu->i_x, p_spu->i_y ); +#endif /* Crop if necessary */ if( i_skipped_top || i_skipped_bottom ) { +#ifdef DEBUG_SPUDEC int i_y = p_spu->i_y + i_skipped_top; int i_height = p_spu->i_height - (i_skipped_top + i_skipped_bottom); - +#endif p_spu_data->i_y_top_offset = i_skipped_top; p_spu_data->i_y_bottom_offset = i_skipped_bottom; +#ifdef DEBUG_SPUDEC msg_Dbg( p_dec, "cropped to: %ix%i, position: %i,%i", p_spu->i_width, i_height, p_spu->i_x, i_y ); +#endif } /* Handle color if no palette was found */ @@ -571,42 +641,34 @@ static int ParseRLE( decoder_t *p_dec, subpicture_t * p_spu, p_spu_data->pi_yuv[i_shade][2] = 0x80; } +#ifdef DEBUG_SPUDEC msg_Dbg( p_dec, "using custom palette (border %i, inner %i, shade %i)", i_border, i_inner, i_shade ); +#endif } return VLC_SUCCESS; } static void Render( decoder_t *p_dec, subpicture_t *p_spu, - subpicture_data_t *p_spu_data ) + subpicture_data_t *p_spu_data, + const spu_properties_t *p_spu_properties ) { uint8_t *p_p; int i_x, i_y, i_len, i_color, i_pitch; uint16_t *p_source = (uint16_t *)p_spu_data->p_data; video_format_t fmt; + video_palette_t palette; /* Create a new subpicture 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_width = fmt.i_visible_width = p_spu->i_width; - fmt.i_height = fmt.i_visible_height = p_spu->i_height - + fmt.i_aspect = 0; /* 0 means use aspect ratio of background video */ + fmt.i_width = fmt.i_visible_width = p_spu_properties->i_width; + fmt.i_height = fmt.i_visible_height = p_spu_properties->i_height - p_spu_data->i_y_top_offset - p_spu_data->i_y_bottom_offset; fmt.i_x_offset = fmt.i_y_offset = 0; - p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt ); - if( !p_spu->p_region ) - { - msg_Err( p_dec, "cannot allocate SPU region" ); - return; - } - - p_spu->p_region->i_x = 0; - p_spu->p_region->i_y = p_spu_data->i_y_top_offset; - p_p = p_spu->p_region->picture.p->p_pixels; - i_pitch = p_spu->p_region->picture.p->i_pitch; - - /* Build palette */ + fmt.p_palette = &palette; fmt.p_palette->i_entries = 4; for( i_x = 0; i_x < fmt.p_palette->i_entries; i_x++ ) { @@ -618,6 +680,18 @@ static void Render( decoder_t *p_dec, subpicture_t *p_spu, p_spu_data->pi_alpha[i_x] << 4; } + p_spu->p_region = subpicture_region_New( &fmt ); + if( !p_spu->p_region ) + { + msg_Err( p_dec, "cannot allocate SPU region" ); + return; + } + + p_spu->p_region->i_x = p_spu_properties->i_x; + p_spu->p_region->i_y = p_spu_properties->i_y + p_spu_data->i_y_top_offset; + p_p = p_spu->p_region->p_picture->p->p_pixels; + i_pitch = p_spu->p_region->p_picture->p->i_pitch; + /* Draw until we reach the bottom of the subtitle */ for( i_y = 0; i_y < (int)fmt.i_height * i_pitch; i_y += i_pitch ) {