X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fspudec%2Fparse.c;h=f2c404faaccd0dc3ccca024f9ddf6b4f8b0dc691;hb=f0c76d5063ea5929f8b514e3bc5b0681cdf8d35e;hp=043553528962d85e7912fe43f376bb84a081df8e;hpb=55c20a717ba871f42bbf2848561efa76c7840f93;p=vlc diff --git a/modules/codec/spudec/parse.c b/modules/codec/spudec/parse.c index 0435535289..f2c404faac 100644 --- a/modules/codec/spudec/parse.c +++ b/modules/codec/spudec/parse.c @@ -1,16 +1,18 @@ /***************************************************************************** * parse.c: SPU parser ***************************************************************************** - * Copyright (C) 2000-2001 VideoLAN - * $Id: parse.c,v 1.13 2003/07/29 22:25:40 gbazin Exp $ + * Copyright (C) 2000-2001, 2005, 2006 the VideoLAN team + * $Id$ * - * Authors: Samuel Hocevar + * Authors: Sam Hocevar + * Laurent Aimar + * Gildas Bazin * * 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 @@ -18,38 +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 /* malloc(), free() */ -#include /* memcpy(), memset() */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include -#include -#include +#include +#include +#include +#include #include "spudec.h" /***************************************************************************** * Local prototypes. *****************************************************************************/ -static int ParseControlSeq ( spudec_thread_t *, subpicture_t * ); -static int ParseRLE ( spudec_thread_t *, subpicture_t *, uint8_t * ); - -static void DestroySPU ( subpicture_t * ); - -static void UpdateSPU ( subpicture_t *, vlc_object_t * ); -static int CropCallback ( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); +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,182 +71,75 @@ static inline unsigned int AddNibble( unsigned int i_code, } } -/***************************************************************************** - * SyncPacket: get in sync with the stream - ***************************************************************************** - * This function makes a few sanity checks and returns 0 if it looks like we - * are at the beginning of a subpicture packet. - *****************************************************************************/ -int E_(SyncPacket)( spudec_thread_t *p_spudec ) -{ - /* Re-align the buffer on an 8-bit boundary */ - RealignBits( &p_spudec->bit_stream ); - - /* The total SPU packet size, often bigger than a PS packet */ - p_spudec->i_spu_size = GetBits( &p_spudec->bit_stream, 16 ); - - /* The RLE stuff size (remove 4 because we just read 32 bits) */ - p_spudec->i_rle_size = ShowBits( &p_spudec->bit_stream, 16 ) - 4; - - /* If the values we got are a bit strange, skip packet */ - if( !p_spudec->i_spu_size - || ( p_spudec->i_rle_size >= p_spudec->i_spu_size ) ) - { - return VLC_EGENERIC; - } - - RemoveBits( &p_spudec->bit_stream, 16 ); - - return VLC_SUCCESS; -} - /***************************************************************************** * ParsePacket: parse an SPU packet and send it to the video output ***************************************************************************** * This function parses the SPU packet and, if valid, sends it to the * video output. *****************************************************************************/ -void E_(ParsePacket)( spudec_thread_t *p_spudec ) +subpicture_t * ParsePacket( decoder_t *p_dec ) { - subpicture_t * p_spu; - uint8_t * p_src; - unsigned int i_offset; - mtime_t i_pts; - - msg_Dbg( p_spudec->p_fifo, "trying to gather a 0x%.2x long subtitle", - p_spudec->i_spu_size ); - - /* We cannot display a subpicture with no date */ - NextPTS( &p_spudec->bit_stream, &i_pts, NULL ); - if( i_pts == 0 ) - { - msg_Warn( p_spudec->p_fifo, "subtitle without a date" ); - return; - } + 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 = vout_CreateSubPicture( p_spudec->p_vout, MEMORY_SUBPICTURE ); - - if( p_spu == NULL ) - { - return; - } + p_spu = p_dec->pf_spu_buffer_new( p_dec ); + if( !p_spu ) return NULL; /* Rationale for the "p_spudec->i_rle_size * 4": we are going to * expand the RLE stuff so that we won't need to read nibbles later * on. This will speed things up a lot. Plus, we'll only need to do * this stupid interlacing stuff once. */ - p_spu->p_sys = malloc( sizeof( subpicture_sys_t ) - + p_spudec->i_rle_size * 4 ); - - if( p_spu->p_sys == NULL ) - { - vout_DestroySubPicture( p_spudec->p_vout, p_spu ); - return; - } - - /* Fill the p_spu structure */ - vlc_mutex_init( p_spudec->p_fifo, &p_spu->p_sys->lock ); - - p_spu->pf_render = E_(RenderSPU); - p_spu->pf_destroy = DestroySPU; - p_spu->p_sys->p_data = (uint8_t*)p_spu->p_sys + sizeof( subpicture_sys_t ); - p_spu->p_sys->b_palette = VLC_FALSE; - - p_spu->p_sys->pi_alpha[0] = 0x00; - p_spu->p_sys->pi_alpha[1] = 0x0f; - p_spu->p_sys->pi_alpha[2] = 0x0f; - p_spu->p_sys->pi_alpha[3] = 0x0f; - - p_spu->p_sys->b_crop = VLC_FALSE; + 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 = false; + p_spu_data->b_auto_crop = false; + p_spu_data->i_y_top_offset = 0; + p_spu_data->i_y_bottom_offset = 0; + + p_spu_data->pi_alpha[0] = 0x00; + p_spu_data->pi_alpha[1] = 0x0f; + p_spu_data->pi_alpha[2] = 0x0f; + p_spu_data->pi_alpha[3] = 0x0f; /* Get display time now. If we do it later, we may miss the PTS. */ - p_spu->p_sys->i_pts = i_pts; - - /* Attach to our input thread */ - p_spu->p_sys->p_input = vlc_object_find( p_spudec->p_fifo, - VLC_OBJECT_INPUT, FIND_PARENT ); - if( p_spu->p_sys->p_input ) - { - vlc_value_t val; - - if( !var_Get( p_spu->p_sys->p_input, "highlight-mutex", &val ) ) - { - vlc_mutex_t *p_mutex = val.p_address; - - vlc_mutex_lock( p_mutex ); - UpdateSPU( p_spu, VLC_OBJECT(p_spu->p_sys->p_input) ); - - var_AddCallback( p_spu->p_sys->p_input, - "highlight", CropCallback, p_spu ); - vlc_mutex_unlock( p_mutex ); - } - } - - /* Allocate the temporary buffer we will parse */ - p_src = malloc( p_spudec->i_rle_size ); - - if( p_src == NULL ) - { - msg_Err( p_spudec->p_fifo, "out of memory" ); - vout_DestroySubPicture( p_spudec->p_vout, p_spu ); - return; - } + p_spu_data->i_pts = p_sys->i_pts; - /* Get RLE data */ - for( i_offset = 0; i_offset < p_spudec->i_rle_size; - i_offset += SPU_CHUNK_SIZE ) - { - GetChunk( &p_spudec->bit_stream, p_src + i_offset, - ( i_offset + SPU_CHUNK_SIZE < p_spudec->i_rle_size ) ? - SPU_CHUNK_SIZE : p_spudec->i_rle_size - i_offset ); - - /* Abort subtitle parsing if we were requested to stop */ - if( p_spudec->p_fifo->b_die ) - { - free( p_src ); - vout_DestroySubPicture( p_spudec->p_vout, p_spu ); - return; - } - } + p_spu->i_original_picture_width = + p_dec->fmt_in.subs.spu.i_original_frame_width; + p_spu->i_original_picture_height = + p_dec->fmt_in.subs.spu.i_original_frame_height; -#if 0 - /* Dump the subtitle info */ - intf_WarnHexDump( 5, p_spu->p_sys->p_data, p_spudec->i_rle_size ); -#endif + memset( &spu_properties, 0, sizeof(spu_properties) ); /* Getting the control part */ - if( ParseControlSeq( p_spudec, p_spu ) ) + if( ParseControlSeq( p_dec, p_spu, p_spu_data, &spu_properties ) ) { /* There was a parse error, delete the subpicture */ - free( p_src ); - vout_DestroySubPicture( p_spudec->p_vout, p_spu ); - return; + p_dec->pf_spu_buffer_del( p_dec, p_spu ); + return NULL; } - /* At this point, no more GetBit() command is needed, so we have all - * the data we need to tell whether the subtitle is valid. Thus we - * try to display it and we ignore b_die. */ - - if( ParseRLE( p_spudec, p_spu, p_src ) ) + /* We try to display it */ + if( ParseRLE( p_dec, p_spu_data, &spu_properties ) ) { /* There was a parse error, delete the subpicture */ - free( p_src ); - vout_DestroySubPicture( p_spudec->p_vout, p_spu ); - return; + p_dec->pf_spu_buffer_del( p_dec, p_spu ); + return NULL; } - msg_Dbg( p_spudec->p_fifo, "total size: 0x%x, RLE offsets: 0x%x 0x%x", - p_spudec->i_spu_size, - p_spu->p_sys->pi_offset[0], p_spu->p_sys->pi_offset[1] ); - - /* SPU is finished - we can ask the video output to display it */ - vout_DisplaySubPicture( p_spudec->p_vout, p_spu ); +#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 - /* TODO: do stuff! */ + Render( p_dec, p_spu, p_spu_data, &spu_properties ); + free( p_spu_data ); - /* Clean up */ - free( p_src ); + return p_spu; } /***************************************************************************** @@ -246,11 +149,13 @@ void E_(ParsePacket)( spudec_thread_t *p_spudec ) * information, coordinates, and so on. For more information on the * subtitles format, see http://sam.zoy.org/doc/dvd/subtitles/index.html *****************************************************************************/ -static int ParseControlSeq( spudec_thread_t *p_spudec, - subpicture_t * p_spu ) +static int ParseControlSeq( decoder_t *p_dec, subpicture_t *p_spu, + subpicture_data_t *p_spu_data, spu_properties_t *p_spu_properties ) { + decoder_sys_t *p_sys = p_dec->p_sys; + /* Our current index in the SPU packet */ - unsigned int i_index = p_spudec->i_rle_size + 4; + unsigned int i_index = p_sys->i_rle_size + 4; /* The next start-of-control-sequence index and the previous one */ unsigned int i_next_seq = 0, i_cur_seq = 0; @@ -259,192 +164,228 @@ static int ParseControlSeq( spudec_thread_t *p_spudec, 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 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)GetBits( &p_spudec->bit_stream, 16 ) * 11000 - * p_spudec->bit_stream.p_pes->i_rate / DEFAULT_RATE; - + date = (mtime_t)GetWBE( &p_sys->buffer[i_index] ) * 11000; + if( p_sys->i_rate ) + date = date * p_sys->i_rate / INPUT_RATE_DEFAULT; + /* Next offset */ i_cur_seq = i_index; - i_next_seq = GetBits( &p_spudec->bit_stream, 16 ); - + 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 = GetBits( &p_spudec->bit_stream, 8 ); - 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->p_sys->i_pts + date; - p_spu->b_ephemer = VLC_TRUE; + p_spu->i_start = p_spu_data->i_pts + date; + 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->p_sys->i_pts + date; + 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->p_sys->i_pts + date; + p_spu->i_stop = p_spu_data->i_pts + date; + i_index += 1; break; case SPU_CMD_SET_PALETTE: - /* 03xxxx (palette) */ - if( p_spudec->p_fifo->p_demux_data - && *(int*)p_spudec->p_fifo->p_demux_data == 0xBeeF ) + if( i_index + 3 > p_sys->i_spu_size ) { - uint32_t i_color; + 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 = true; + + 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; - p_spu->p_sys->b_palette = VLC_TRUE; for( i = 0; i < 4 ; i++ ) { - i_color = ((uint32_t*)((char*)p_spudec->p_fifo-> - p_demux_data + sizeof(int)))[ - GetBits(&p_spudec->bit_stream, 4) ]; + uint32_t i_color = p_dec->fmt_in.subs.spu.palette[1+idx[i]]; /* FIXME: this job should be done sooner */ - p_spu->p_sys->pi_yuv[3-i][0] = (i_color>>16) & 0xff; - p_spu->p_sys->pi_yuv[3-i][1] = (i_color>>0) & 0xff; - p_spu->p_sys->pi_yuv[3-i][2] = (i_color>>8) & 0xff; + p_spu_data->pi_yuv[3-i][0] = (i_color>>16) & 0xff; + p_spu_data->pi_yuv[3-i][1] = (i_color>>0) & 0xff; + p_spu_data->pi_yuv[3-i][2] = (i_color>>8) & 0xff; } } - else - { - RemoveBits( &p_spudec->bit_stream, 16 ); - } - i_index += 2; + i_index += 3; break; case SPU_CMD_SET_ALPHACHANNEL: /* 04xxxx (alpha channel) */ - pi_alpha[3] = GetBits( &p_spudec->bit_stream, 4 ); - pi_alpha[2] = GetBits( &p_spudec->bit_stream, 4 ); - pi_alpha[1] = GetBits( &p_spudec->bit_stream, 4 ); - pi_alpha[0] = GetBits( &p_spudec->bit_stream, 4 ); - - /* 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->p_sys->pi_alpha[0] = pi_alpha[0]; - p_spu->p_sys->pi_alpha[1] = pi_alpha[1]; - p_spu->p_sys->pi_alpha[2] = pi_alpha[2]; - p_spu->p_sys->pi_alpha[3] = pi_alpha[3]; - } - else + if( i_index + 3 > p_sys->i_spu_size ) { - msg_Warn( p_spudec->p_fifo, "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 = GetBits( &p_spudec->bit_stream, 12 ); - p_spu->i_width = GetBits( &p_spudec->bit_stream, 12 ) - - 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_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; - p_spu->i_y = GetBits( &p_spudec->bit_stream, 12 ); - p_spu->i_height = GetBits( &p_spudec->bit_stream, 12 ) - - p_spu->i_y + 1; + /* Auto crop fullscreen subtitles */ + 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->p_sys->pi_offset[0] = - GetBits( &p_spudec->bit_stream, 16 ) - 4; - - p_spu->p_sys->pi_offset[1] = - GetBits( &p_spudec->bit_stream, 16 ) - 4; + if( i_index + 5 > p_sys->i_spu_size ) + { + msg_Err( p_dec, "overflow in SPU command" ); + return VLC_EGENERIC; + } - i_index += 4; + 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_Err( p_spudec->p_fifo, "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_spudec->p_fifo->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 ) { - msg_Err( p_spudec->p_fifo, "index mismatch (0x%.4x != 0x%.4x)", - i_next_seq, i_cur_seq ); + msg_Err( p_dec, "index mismatch (0x%.4x != 0x%.4x)", + i_next_seq, i_cur_seq ); return VLC_EGENERIC; } - if( i_index > p_spudec->i_spu_size ) + if( i_index > p_sys->i_spu_size ) { - msg_Err( p_spudec->p_fifo, "uh-oh, we went too far (0x%.4x > 0x%.4x)", - i_index, p_spudec->i_spu_size ); + msg_Err( p_dec, "uh-oh, we went too far (0x%.4x > 0x%.4x)", + i_index, p_sys->i_spu_size ); return VLC_EGENERIC; } if( !p_spu->i_start ) { - msg_Err( p_spudec->p_fifo, "no `start display' command" ); + 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_spudec->bit_stream.p_pes->i_rate / DEFAULT_RATE; - p_spu->b_ephemer = VLC_TRUE; + p_spu->i_stop = p_spu->i_start + (mtime_t)500 * 11000; + p_spu->b_ephemer = true; } /* Get rid of padding bytes */ - switch( p_spudec->i_spu_size - i_index ) + if( p_sys->i_spu_size > i_index + 1 ) { - /* Zero or one padding byte, quite usual */ - case 1: - RemoveBits( &p_spudec->bit_stream, 8 ); - i_index++; - case 0: - break; - - /* More than one padding byte - this is very strange, but - * we can deal with it */ - default: - msg_Warn( p_spudec->p_fifo, - "%i padding bytes, we usually get 0 or 1 of them", - p_spudec->i_spu_size - i_index ); - - while( i_index < p_spudec->i_spu_size ) - { - RemoveBits( &p_spudec->bit_stream, 8 ); - i_index++; - } - - break; + /* Zero or one padding byte are quite usual + * More than one padding byte - this is very strange, but + * 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 ); } /* Successfully parsed ! */ @@ -458,35 +399,37 @@ static int ParseControlSeq( spudec_thread_t *p_spudec, * 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( spudec_thread_t *p_spudec, - subpicture_t * p_spu, uint8_t * p_src ) +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->p_sys->p_data; + uint16_t *p_dest = (uint16_t *)p_spu_data->p_data; /* The subtitles are interlaced, we need two offsets */ unsigned int i_id = 0; /* Start on the even SPU layer */ unsigned int pi_table[ 2 ]; unsigned int *pi_offset; -#if 0 /* cropping */ - vlc_bool_t b_empty_top = VLC_TRUE, - b_empty_bottom = VLC_FALSE; - unsigned int i_skipped_top = 0, - i_skipped_bottom = 0; -#endif - + /* Cropping */ + bool b_empty_top = true; + unsigned int i_skipped_top = 0, i_skipped_bottom = 0; + unsigned int i_transparent_code = 0; + /* Colormap statistics */ int i_border = -1; int stats[4]; stats[0] = stats[1] = stats[2] = stats[3] = 0; - pi_table[ 0 ] = p_spu->p_sys->pi_offset[ 0 ] << 1; - pi_table[ 1 ] = p_spu->p_sys->pi_offset[ 1 ] << 1; + pi_table[ 0 ] = p_spu_data->pi_offset[ 0 ] << 1; + pi_table[ 1 ] = p_spu_data->pi_offset[ 1 ] << 1; for( i_y = 0 ; i_y < i_height ; i_y++ ) { @@ -519,7 +462,7 @@ static int ParseRLE( spudec_thread_t *p_spudec, else { /* We have a boo boo ! */ - msg_Err( p_spudec->p_fifo, "unknown RLE code " + msg_Err( p_dec, "unknown RLE code " "0x%.4x", i_code ); return VLC_EGENERIC; } @@ -530,58 +473,72 @@ static int ParseRLE( spudec_thread_t *p_spudec, if( ( (i_code >> 2) + i_x + i_y * i_width ) > i_height * i_width ) { - msg_Err( p_spudec->p_fifo, - "out of bounds, %i at (%i,%i) is out of %ix%i", + msg_Err( p_dec, "out of bounds, %i at (%i,%i) is out of %ix%i", i_code >> 2, i_x, i_y, i_width, i_height ); return VLC_EGENERIC; } /* Try to find the border color */ - if( p_spu->p_sys->pi_alpha[ i_code & 0x3 ] != 0x00 ) + if( p_spu_data->pi_alpha[ i_code & 0x3 ] != 0x00 ) { i_border = i_code & 0x3; stats[i_border] += i_code >> 2; } -#if 0 /* cropping */ - if( (i_code >> 2) == i_width - && p_spu->p_sys->pi_alpha[ i_code & 0x3 ] == 0x00 ) + /* Auto crop subtitles (a lot more optimized) */ + if( p_spu_data->b_auto_crop ) { - if( b_empty_top ) + if( !i_y ) + { + /* We assume that if the first line is transparent, then + * it is using the palette index for the + * (background) transparent color */ + if( (i_code >> 2) == i_width && + p_spu_data->pi_alpha[ i_code & 0x3 ] == 0x00 ) + { + i_transparent_code = i_code; + } + else + { + p_spu_data->b_auto_crop = false; + } + } + + if( i_code == i_transparent_code ) { - /* This is a blank top line, we skip it */ - i_skipped_top++; + if( b_empty_top ) + { + /* This is a blank top line, we skip it */ + i_skipped_top++; + } + else + { + /* We can't be sure the current lines will be skipped, + * so we store the code just in case. */ + *p_dest++ = i_code; + i_skipped_bottom++; + } } else { - /* We can't be sure the current lines will be skipped, - * so we store the code just in case. */ + /* We got a valid code, store it */ *p_dest++ = i_code; - b_empty_bottom = VLC_TRUE; - i_skipped_bottom++; + /* Valid code means no blank line */ + b_empty_top = false; + i_skipped_bottom = 0; } } else { - /* We got a valid code, store it */ *p_dest++ = i_code; - - /* Valid code means no blank line */ - b_empty_top = VLC_FALSE; - b_empty_bottom = VLC_FALSE; - i_skipped_bottom = 0; } -#else - *p_dest++ = i_code; -#endif } /* Check that we didn't go too far */ if( i_x > i_width ) { - msg_Err( p_spudec->p_fifo, "i_x overflowed, %i > %i", - i_x, i_width ); + msg_Err( p_dec, "i_x overflowed, %i > %i", i_x, i_width ); return VLC_EGENERIC; } @@ -598,9 +555,9 @@ static int ParseRLE( spudec_thread_t *p_spudec, /* We shouldn't get any padding bytes */ if( i_y < i_height ) { - msg_Err( p_spudec->p_fifo, "padding bytes found in RLE sequence" ); - msg_Err( p_spudec->p_fifo, "send mail to if you " - "want to help debugging this" ); + msg_Err( p_dec, "padding bytes found in RLE sequence" ); + msg_Err( p_dec, "send mail to if you " + "want to help debugging this" ); /* Skip them just in case */ while( i_y < i_height ) @@ -612,30 +569,35 @@ static int ParseRLE( spudec_thread_t *p_spudec, return VLC_EGENERIC; } - msg_Dbg( p_spudec->p_fifo, "valid subtitle, size: %ix%i, position: %i,%i", +#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 -#if 0 /* cropping */ /* Crop if necessary */ if( i_skipped_top || i_skipped_bottom ) { - p_spu->i_y += i_skipped_top; - p_spu->i_height -= i_skipped_top + i_skipped_bottom; - - msg_Dbg( p_spudec->p_fifo, "cropped to: %ix%i, position: %i,%i", - p_spu->i_width, p_spu->i_height, p_spu->i_x, p_spu->i_y ); - } +#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 */ - if( !p_spu->p_sys->b_palette ) + if( !p_spu_data->b_palette ) { int i, i_inner = -1, i_shade = -1; /* Set the border color */ - p_spu->p_sys->pi_yuv[i_border][0] = 0x00; - p_spu->p_sys->pi_yuv[i_border][1] = 0x80; - p_spu->p_sys->pi_yuv[i_border][2] = 0x80; + p_spu_data->pi_yuv[i_border][0] = 0x00; + p_spu_data->pi_yuv[i_border][1] = 0x80; + p_spu_data->pi_yuv[i_border][2] = 0x80; stats[i_border] = 0; /* Find the inner colors */ @@ -666,103 +628,80 @@ static int ParseRLE( spudec_thread_t *p_spudec, /* Set the inner color */ if( i_inner != -1 ) { - p_spu->p_sys->pi_yuv[i_inner][0] = 0xff; - p_spu->p_sys->pi_yuv[i_inner][1] = 0x80; - p_spu->p_sys->pi_yuv[i_inner][2] = 0x80; + p_spu_data->pi_yuv[i_inner][0] = 0xff; + p_spu_data->pi_yuv[i_inner][1] = 0x80; + p_spu_data->pi_yuv[i_inner][2] = 0x80; } /* Set the anti-aliasing color */ if( i_shade != -1 ) { - p_spu->p_sys->pi_yuv[i_shade][0] = 0x80; - p_spu->p_sys->pi_yuv[i_shade][1] = 0x80; - p_spu->p_sys->pi_yuv[i_shade][2] = 0x80; + p_spu_data->pi_yuv[i_shade][0] = 0x80; + p_spu_data->pi_yuv[i_shade][1] = 0x80; + p_spu_data->pi_yuv[i_shade][2] = 0x80; } - msg_Dbg( p_spudec->p_fifo, - "using custom palette (border %i, inner %i, shade %i)", +#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; } -/***************************************************************************** - * DestroySPU: subpicture destructor - *****************************************************************************/ -static void DestroySPU( subpicture_t *p_spu ) -{ - if( p_spu->p_sys->p_input ) - { - /* Detach from our input thread */ - var_DelCallback( p_spu->p_sys->p_input, "highlight", - CropCallback, p_spu ); - vlc_object_release( p_spu->p_sys->p_input ); - } - - vlc_mutex_destroy( &p_spu->p_sys->lock ); - free( p_spu->p_sys ); -} - -/***************************************************************************** - * UpdateSPU: update subpicture settings - ***************************************************************************** - * This function is called from CropCallback and at initialization time, to - * retrieve crop information from the input. - *****************************************************************************/ -static void UpdateSPU( subpicture_t *p_spu, vlc_object_t *p_object ) +static void Render( decoder_t *p_dec, subpicture_t *p_spu, + subpicture_data_t *p_spu_data, + const spu_properties_t *p_spu_properties ) { - vlc_value_t val; - - if( var_Get( p_object, "highlight", &val ) ) + 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 = 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; + fmt.p_palette = &palette; + fmt.p_palette->i_entries = 4; + for( i_x = 0; i_x < fmt.p_palette->i_entries; i_x++ ) { - return; + fmt.p_palette->palette[i_x][0] = p_spu_data->pi_yuv[i_x][0]; + fmt.p_palette->palette[i_x][1] = p_spu_data->pi_yuv[i_x][1]; + fmt.p_palette->palette[i_x][2] = p_spu_data->pi_yuv[i_x][2]; + fmt.p_palette->palette[i_x][3] = + p_spu_data->pi_alpha[i_x] == 0xf ? 0xff : + p_spu_data->pi_alpha[i_x] << 4; } - p_spu->p_sys->b_crop = val.b_bool; - if( !p_spu->p_sys->b_crop ) + p_spu->p_region = subpicture_region_New( &fmt ); + if( !p_spu->p_region ) { + msg_Err( p_dec, "cannot allocate SPU region" ); return; } - var_Get( p_object, "x-start", &val ); - p_spu->p_sys->i_x_start = val.i_int; - var_Get( p_object, "y-start", &val ); - p_spu->p_sys->i_y_start = val.i_int; - var_Get( p_object, "x-end", &val ); - p_spu->p_sys->i_x_end = val.i_int; - var_Get( p_object, "y-end", &val ); - p_spu->p_sys->i_y_end = val.i_int; - -#if 0 - if( var_Get( p_object, "color", &val ) == VLC_SUCCESS ) - { - p_spu->p_sys->pi_color[0] = ((uint8_t *)val.p_address)[0]; - p_spu->p_sys->pi_color[1] = ((uint8_t *)val.p_address)[1]; - p_spu->p_sys->pi_color[2] = ((uint8_t *)val.p_address)[2]; - p_spu->p_sys->pi_color[3] = ((uint8_t *)val.p_address)[3]; - } -#endif + 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; - if( var_Get( p_object, "contrast", &val ) == VLC_SUCCESS ) + /* 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 ) { - p_spu->p_sys->pi_alpha[0] = ((uint8_t *)val.p_address)[0]; - p_spu->p_sys->pi_alpha[1] = ((uint8_t *)val.p_address)[1]; - p_spu->p_sys->pi_alpha[2] = ((uint8_t *)val.p_address)[2]; - p_spu->p_sys->pi_alpha[3] = ((uint8_t *)val.p_address)[3]; + /* Draw until we reach the end of the line */ + for( i_x = 0 ; i_x < (int)fmt.i_width; i_x += i_len ) + { + /* Get the RLE part, then draw the line */ + i_color = *p_source & 0x3; + i_len = *p_source++ >> 2; + memset( p_p + i_x + i_y, i_color, i_len ); + } } } - -/***************************************************************************** - * CropCallback: called when the highlight properties are changed - ***************************************************************************** - * This callback is called from the input thread when we need cropping - *****************************************************************************/ -static int CropCallback( vlc_object_t *p_object, char const *psz_var, - vlc_value_t oldval, vlc_value_t newval, void *p_data ) -{ - UpdateSPU( (subpicture_t *)p_data, p_object ); - - return VLC_SUCCESS; -} -