/*****************************************************************************
- * spudec.c : spu decoder thread
+ * spudec.c : SPU decoder thread
*****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
- * $Id: spudec.c,v 1.1 2002/08/04 17:23:42 sam Exp $
+ * Copyright (C) 2000-2001, 2006 the VideoLAN team
+ * $Id$
*
- * Authors: Samuel Hocevar <sam@zoy.org>
- * Rudolf Cornelissen <rag.cornelissen@inter.nl.net>
+ * Authors: Sam Hocevar <sam@zoy.org>
+ * Laurent Aimar <fenrir@via.ecp.fr>
*
* 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
*
* 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 <stdlib.h> /* malloc(), free() */
-#include <string.h> /* memcpy(), memset() */
-
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/decoder.h>
-
-#ifdef HAVE_UNISTD_H
-# include <unistd.h> /* getpid() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
-#ifdef WIN32 /* getpid() for win32 is located in process.h */
-# include <process.h>
-#endif
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_codec.h>
#include "spudec.h"
/*****************************************************************************
- * Local prototypes
+ * Module descriptor.
*****************************************************************************/
-static int OpenDecoder ( vlc_object_t * );
-static int RunDecoder ( decoder_fifo_t * );
-static int InitThread ( spudec_thread_t * );
-static void EndThread ( spudec_thread_t * );
+static int DecoderOpen ( vlc_object_t * );
+static int PacketizerOpen( vlc_object_t * );
+static void Close ( vlc_object_t * );
+
+vlc_module_begin ()
+ set_description( N_("DVD subtitles decoder") )
+ set_capability( "decoder", 50 )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_SCODEC )
+ set_callbacks( DecoderOpen, Close )
+
+ add_submodule ()
+ set_description( N_("DVD subtitles packetizer") )
+ set_capability( "packetizer", 50 )
+ set_callbacks( PacketizerOpen, Close )
+vlc_module_end ()
-static int SyncPacket ( spudec_thread_t * );
-static void ParsePacket ( spudec_thread_t * );
-static int ParseControlSequences( spudec_thread_t *, subpicture_t * );
-static int ParseRLE ( spudec_thread_t *, subpicture_t *, u8 * );
-static void RenderSPU ( vout_thread_t *, picture_t *,
- const subpicture_t * );
/*****************************************************************************
- * Module descriptor.
+ * Local prototypes
*****************************************************************************/
-vlc_module_begin();
- set_description( _("DVD subtitles decoder module") );
- set_capability( "decoder", 50 );
- set_callbacks( OpenDecoder, NULL );
-vlc_module_end();
+static block_t * Reassemble( decoder_t *, block_t ** );
+static subpicture_t * Decode ( decoder_t *, block_t ** );
+static block_t * Packetize ( decoder_t *, block_t ** );
/*****************************************************************************
- * OpenDecoder: probe the decoder and return score
+ * DecoderOpen
*****************************************************************************
- * Tries to launch a decoder and return score so that the interface is able
+ * Tries to launch a decoder and return score so that the interface is able
* to chose.
*****************************************************************************/
-static int OpenDecoder( vlc_object_t *p_this )
-{
- decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this;
-
- if( p_fifo->i_fourcc == VLC_FOURCC('s','p','u',' ') )
- {
- p_fifo->pf_run = RunDecoder;
- return VLC_SUCCESS;
- }
-
- return VLC_EGENERIC;
-}
-
-/*****************************************************************************
- * RunDecoder: this function is called just after the thread is created
- *****************************************************************************/
-static int RunDecoder( decoder_fifo_t * p_fifo )
+static int DecoderOpen( vlc_object_t *p_this )
{
- spudec_thread_t * p_spudec;
-
- /* Allocate the memory needed to store the thread's structure */
- p_spudec = (spudec_thread_t *)malloc( sizeof(spudec_thread_t) );
+ decoder_t *p_dec = (decoder_t*)p_this;
+ decoder_sys_t *p_sys;
- if ( p_spudec == NULL )
+ if( p_dec->fmt_in.i_codec != VLC_FOURCC( 's','p','u',' ' ) &&
+ p_dec->fmt_in.i_codec != VLC_FOURCC( 's','p','u','b' ) )
{
- msg_Err( p_fifo, "out of memory" );
- DecoderError( p_fifo );
- return( -1 );
+ return VLC_EGENERIC;
}
-
- /*
- * Initialize the thread properties
- */
- p_spudec->p_vout = NULL;
- p_spudec->p_fifo = p_fifo;
-
- /*
- * Initialize thread and free configuration
- */
- p_spudec->p_fifo->b_error = InitThread( p_spudec );
- /*
- * Main loop - it is not executed if an error occured during
- * initialization
- */
- while( (!p_spudec->p_fifo->b_die) && (!p_spudec->p_fifo->b_error) )
- {
- if( !SyncPacket( p_spudec ) )
- {
- ParsePacket( p_spudec );
- }
- }
+ p_dec->p_sys = p_sys = malloc( sizeof( decoder_sys_t ) );
- /*
- * Error loop
- */
- if( p_spudec->p_fifo->b_error )
- {
- DecoderError( p_spudec->p_fifo );
-
- /* End of thread */
- EndThread( p_spudec );
- return -1;
- }
+ p_sys->b_packetizer = false;
+ p_sys->i_spu_size = 0;
+ p_sys->i_spu = 0;
+ p_sys->p_block = NULL;
- /* End of thread */
- EndThread( p_spudec );
- return 0;
-}
+ es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) );
-/* following functions are local */
+ p_dec->pf_decode_sub = Decode;
+ p_dec->pf_packetize = NULL;
-/*****************************************************************************
- * InitThread: initialize spu decoder thread
- *****************************************************************************
- * This function is called from RunThread and performs the second step of the
- * initialization. It returns 0 on success. Note that the thread's flag are not
- * modified inside this function.
- *****************************************************************************/
-static int InitThread( spudec_thread_t *p_spudec )
-{
- /* Find an available video output */
- do
- {
- if( p_spudec->p_fifo->b_die || p_spudec->p_fifo->b_error )
- {
- return -1;
- }
-
- p_spudec->p_vout = vlc_object_find( p_spudec->p_fifo, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
-
- if( p_spudec->p_vout )
- {
- break;
- }
-
- msleep( VOUT_OUTMEM_SLEEP );
- }
- while( 1 );
-
- InitBitstream( &p_spudec->bit_stream, p_spudec->p_fifo, NULL, NULL );
-
- /* Mark thread as running and return */
- return 0;
+ return VLC_SUCCESS;
}
/*****************************************************************************
- * EndThread: thread destruction
+ * PacketizerOpen
*****************************************************************************
- * This function is called when the thread ends after a sucessful
- * initialization.
- *****************************************************************************/
-static void EndThread( spudec_thread_t *p_spudec )
-{
- if( p_spudec->p_vout != NULL
- && p_spudec->p_vout->p_subpicture != NULL )
- {
- subpicture_t * p_subpic;
- int i_subpic;
-
- for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ )
- {
- p_subpic = &p_spudec->p_vout->p_subpicture[i_subpic];
-
- if( p_subpic != NULL &&
- ( ( p_subpic->i_status == RESERVED_SUBPICTURE )
- || ( p_subpic->i_status == READY_SUBPICTURE ) ) )
- {
- vout_DestroySubPicture( p_spudec->p_vout, p_subpic );
- }
- }
-
- vlc_object_release( p_spudec->p_vout );
- }
-
- free( p_spudec );
-}
-
-/*****************************************************************************
- * 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.
+ * Tries to launch a decoder and return score so that the interface is able
+ * to chose.
*****************************************************************************/
-static int SyncPacket( spudec_thread_t *p_spudec )
+static int PacketizerOpen( vlc_object_t *p_this )
{
- /* 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 );
+ decoder_t *p_dec = (decoder_t*)p_this;
- /* 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 ) )
+ if( DecoderOpen( p_this ) )
{
- return( 1 );
+ return VLC_EGENERIC;
}
+ p_dec->pf_packetize = Packetize;
+ p_dec->p_sys->b_packetizer = true;
+ es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
+ p_dec->fmt_out.i_codec = VLC_FOURCC( 's','p','u',' ' );
- RemoveBits( &p_spudec->bit_stream, 16 );
-
- return( 0 );
+ 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.
+ * Close:
*****************************************************************************/
-static void ParsePacket( spudec_thread_t *p_spudec )
+static void Close( vlc_object_t *p_this )
{
- subpicture_t * p_spu;
- u8 * p_src;
- unsigned int i_offset;
-
- msg_Dbg( p_spudec->p_fifo, "trying to gather a 0x%.2x long subtitle",
- p_spudec->i_spu_size );
+ decoder_t *p_dec = (decoder_t*)p_this;
+ decoder_sys_t *p_sys = p_dec->p_sys;
- /* We cannot display a subpicture with no date */
- if( p_spudec->p_fifo->p_first->i_pts == 0 )
+ if( p_sys->p_block )
{
- msg_Warn( p_spudec->p_fifo, "subtitle without a date" );
- return;
+ block_ChainRelease( p_sys->p_block );
}
- /* Allocate the subpicture internal data. */
- p_spu = vout_CreateSubPicture( p_spudec->p_vout, MEMORY_SUBPICTURE,
- sizeof( subpicture_sys_t )
- + p_spudec->i_rle_size * 4 );
- /* 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. */
-
- if( p_spu == NULL )
- {
- return;
- }
-
- /* Fill the p_spu structure */
- p_spu->pf_render = RenderSPU;
- p_spu->p_sys->p_data = (u8*)p_spu->p_sys + sizeof( subpicture_sys_t );
- p_spu->p_sys->b_palette = 0;
-
- /* Get display time now. If we do it later, we may miss the PTS. */
- p_spu->p_sys->i_pts = p_spudec->p_fifo->p_first->i_pts;
-
- /* 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;
- }
-
- /* 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;
- }
- }
-
-#if 0
- /* Dump the subtitle info */
- intf_WarnHexDump( 5, p_spu->p_sys->p_data, p_spudec->i_rle_size );
-#endif
-
- /* Getting the control part */
- if( ParseControlSequences( p_spudec, p_spu ) )
- {
- /* There was a parse error, delete the subpicture */
- free( p_src );
- vout_DestroySubPicture( p_spudec->p_vout, p_spu );
- return;
- }
-
- /* 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 ) )
- {
- /* There was a parse error, delete the subpicture */
- free( p_src );
- vout_DestroySubPicture( p_spudec->p_vout, p_spu );
- return;
- }
-
- 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 );
-
- /* Clean up */
- free( p_src );
+ free( p_sys );
}
/*****************************************************************************
- * ParseControlSequences: parse all SPU control sequences
- *****************************************************************************
- * This is the most important part in SPU decoding. We get dates, palette
- * information, coordinates, and so on. For more information on the
- * subtitles format, see http://sam.zoy.org/doc/dvd/subtitles/index.html
+ * Decode:
*****************************************************************************/
-static int ParseControlSequences( spudec_thread_t *p_spudec,
- subpicture_t * p_spu )
+static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
{
- /* Our current index in the SPU packet */
- int i_index = p_spudec->i_rle_size + 4;
-
- /* The next start-of-control-sequence index and the previous one */
- int i_next_seq, i_cur_seq;
-
- /* Command time and date */
- u8 i_command;
- int i_date;
-
- int i, pi_alpha[4];
-
- /* XXX: temporary variables */
- vlc_bool_t b_force_display = 0;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_spu_block;
+ subpicture_t *p_spu;
- /* Initialize the structure */
- p_spu->i_start = p_spu->i_stop = 0;
- p_spu->b_ephemer = 0;
+ p_spu_block = Reassemble( p_dec, pp_block );
- do
+ if( ! p_spu_block )
{
- /* Get the control sequence date */
- i_date = GetBits( &p_spudec->bit_stream, 16 );
-
- /* Next offset */
- i_cur_seq = i_index;
- i_next_seq = GetBits( &p_spudec->bit_stream, 16 );
-
- /* Skip what we just read */
- i_index += 4;
-
- do
- {
- i_command = GetBits( &p_spudec->bit_stream, 8 );
- i_index++;
-
- switch( i_command )
- {
- case SPU_CMD_FORCE_DISPLAY:
-
- /* 00 (force displaying) */
- p_spu->i_start = p_spu->p_sys->i_pts + ( i_date * 11000 );
- b_force_display = 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 + ( i_date * 11000 );
-
- break;
-
- case SPU_CMD_STOP_DISPLAY:
-
- /* 02 (stop displaying) */
- p_spu->i_stop = p_spu->p_sys->i_pts + ( i_date * 11000 );
-
- 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 )
- {
- u32 i_color;
-
- p_spu->p_sys->b_palette = 1;
- for( i = 0; i < 4 ; i++ )
- {
- i_color = ((u32*)((char*)p_spudec->p_fifo->
- p_demux_data + sizeof(int)))[
- GetBits(&p_spudec->bit_stream, 4) ];
-
- /* FIXME: this job should be done sooner */
-#ifndef WORDS_BIGENDIAN
- 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;
-#else
- p_spu->p_sys->pi_yuv[3-i][0] = (i_color>>8) & 0xff;
- p_spu->p_sys->pi_yuv[3-i][1] = (i_color>>24) & 0xff;
- p_spu->p_sys->pi_yuv[3-i][2] = (i_color>>16) & 0xff;
-#endif
- }
- }
- else
- {
- RemoveBits( &p_spudec->bit_stream, 16 );
- }
- i_index += 2;
-
- 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
- {
- msg_Warn( p_spudec->p_fifo,
- "ignoring blank alpha palette" );
- }
-
- i_index += 2;
-
- 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;
-
- 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;
-
- i_index += 6;
-
- 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;
-
- i_index += 4;
-
- break;
-
- case SPU_CMD_END:
-
- /* ff (end) */
- break;
-
- default:
-
- /* xx (unknown command) */
- msg_Err( p_spudec->p_fifo, "unknown command 0x%.2x",
- i_command );
- return( 1 );
- }
-
- /* We need to check for quit commands here */
- if( p_spudec->p_fifo->b_die )
- {
- return( 1 );
- }
-
- } while( i_command != SPU_CMD_END );
-
- } while( i_index == i_next_seq );
-
- /* 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 );
- return( 1 );
+ return NULL;
}
- if( i_index > p_spudec->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 );
- return( 1 );
- }
+ /* FIXME: what the, we shouldn’t need to allocate 64k of buffer --sam. */
+ p_sys->i_spu = block_ChainExtract( p_spu_block, p_sys->buffer, 65536 );
+ p_sys->i_pts = p_spu_block->i_pts;
+ block_ChainRelease( p_spu_block );
- if( !p_spu->i_start )
- {
- msg_Err( p_spudec->p_fifo, "no `start display' command" );
- }
-
- if( !p_spu->i_stop )
- {
- /* This subtitle will live for 5 seconds or until the next subtitle */
- p_spu->i_stop = p_spu->i_start + 500 * 11000;
- p_spu->b_ephemer = 1;
- }
-
- /* Get rid of padding bytes */
- switch( p_spudec->i_spu_size - i_index )
- {
- /* 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 );
+ /* Parse and decode */
+ p_spu = ParsePacket( p_dec );
- while( i_index < p_spudec->i_spu_size )
- {
- RemoveBits( &p_spudec->bit_stream, 8 );
- i_index++;
- }
+ /* reinit context */
+ p_sys->i_spu_size = 0;
+ p_sys->i_rle_size = 0;
+ p_sys->i_spu = 0;
+ p_sys->p_block = NULL;
- break;
- }
-
- if( b_force_display )
- {
- msg_Err( p_spudec->p_fifo, "\"force display\" command" );
- msg_Err( p_spudec->p_fifo, "send mail to <sam@zoy.org> if you "
- "want to help debugging this" );
- }
-
- /* Successfully parsed ! */
- return( 0 );
+ return p_spu;
}
/*****************************************************************************
- * ParseRLE: parse the RLE part of the subtitle
- *****************************************************************************
- * This part parses the subtitle graphical data and stores it in a more
- * convenient structure for later decoding. For more information on the
- * subtitles format, see http://sam.zoy.org/doc/dvd/subtitles/index.html
+ * Packetize:
*****************************************************************************/
-static int ParseRLE( spudec_thread_t *p_spudec,
- subpicture_t * p_spu, u8 * p_src )
+static block_t *Packetize( decoder_t *p_dec, block_t **pp_block )
{
- unsigned int i_code;
-
- unsigned int i_width = p_spu->i_width;
- unsigned int i_height = p_spu->i_height;
- unsigned int i_x, i_y;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_spu = Reassemble( p_dec, pp_block );
- u16 *p_dest = (u16 *)p_spu->p_sys->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;
-
- vlc_bool_t b_empty_top = 1,
- b_empty_bottom = 0;
- unsigned int i_skipped_top = 0,
- i_skipped_bottom = 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;
-
- for( i_y = 0 ; i_y < i_height ; i_y++ )
- {
- pi_offset = pi_table + i_id;
-
- for( i_x = 0 ; i_x < i_width ; i_x += i_code >> 2 )
- {
- i_code = AddNibble( 0, p_src, pi_offset );
-
- if( i_code < 0x04 )
- {
- i_code = AddNibble( i_code, p_src, pi_offset );
-
- if( i_code < 0x10 )
- {
- i_code = AddNibble( i_code, p_src, pi_offset );
-
- if( i_code < 0x040 )
- {
- i_code = AddNibble( i_code, p_src, pi_offset );
-
- if( i_code < 0x0100 )
- {
- /* If the 14 first bits are set to 0, then it's a
- * new line. We emulate it. */
- if( i_code < 0x0004 )
- {
- i_code |= ( i_width - i_x ) << 2;
- }
- else
- {
- /* We have a boo boo ! */
- msg_Err( p_spudec->p_fifo, "unknown RLE code "
- "0x%.4x", i_code );
- return( 1 );
- }
- }
- }
- }
- }
-
- 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",
- i_code >> 2, i_x, i_y, i_width, i_height );
- return( 1 );
- }
-
- /* Try to find the border color */
- if( p_spu->p_sys->pi_alpha[ i_code & 0x3 ] != 0x00 )
- {
- i_border = i_code & 0x3;
- stats[i_border] += i_code >> 2;
- }
-
- if( (i_code >> 2) == i_width
- && p_spu->p_sys->pi_alpha[ i_code & 0x3 ] == 0x00 )
- {
- 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;
-
- b_empty_bottom = 1;
- i_skipped_bottom++;
- }
- }
- else
- {
- /* We got a valid code, store it */
- *p_dest++ = i_code;
-
- /* Valid code means no blank line */
- b_empty_top = 0;
- b_empty_bottom = 0;
- i_skipped_bottom = 0;
- }
- }
-
- /* 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 );
- return( 1 );
- }
-
- /* Byte-align the stream */
- if( *pi_offset & 0x1 )
- {
- (*pi_offset)++;
- }
-
- /* Swap fields */
- i_id = ~i_id & 0x1;
- }
-
- /* 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 <sam@zoy.org> if you "
- "want to help debugging this" );
-
- /* Skip them just in case */
- while( i_y < i_height )
- {
- *p_dest++ = i_width << 2;
- i_y++;
- }
-
- return( 1 );
- }
-
- msg_Dbg( p_spudec->p_fifo, "valid subtitle, size: %ix%i, position: %i,%i",
- p_spu->i_width, p_spu->i_height, p_spu->i_x, p_spu->i_y );
-
- /* Crop if necessary */
- if( i_skipped_top || i_skipped_bottom )
+ if( ! p_spu )
{
- 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 );
+ return NULL;
}
- /* Handle color if no palette was found */
- if( !p_spu->p_sys->b_palette )
- {
- int i, i_inner = -1, i_shade = -1;
+ p_spu->i_dts = p_spu->i_pts;
+ p_spu->i_length = 0;
- /* 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;
- stats[i_border] = 0;
+ /* reinit context */
+ p_sys->i_spu_size = 0;
+ p_sys->i_rle_size = 0;
+ p_sys->i_spu = 0;
+ p_sys->p_block = NULL;
- /* Find the inner colors */
- for( i = 0 ; i < 4 && i_inner == -1 ; i++ )
- {
- if( stats[i] )
- {
- i_inner = i;
- }
- }
-
- for( ; i < 4 && i_shade == -1 ; i++ )
- {
- if( stats[i] )
- {
- if( stats[i] > stats[i_inner] )
- {
- i_shade = i_inner;
- i_inner = i;
- }
- else
- {
- i_shade = i;
- }
- }
- }
-
- /* 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;
- }
-
- /* 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;
- }
-
- msg_Dbg( p_spudec->p_fifo,
- "using custom palette (border %i, inner %i, shade %i)",
- i_border, i_inner, i_shade );
- }
-
- return( 0 );
+ return block_ChainGather( p_spu );
}
/*****************************************************************************
- * RenderSPU: draw an SPU on a picture
- *****************************************************************************
- * This is a fast implementation of the subpicture drawing code. The data
- * has been preprocessed once, so we don't need to parse the RLE buffer again
- * and again. Most sanity checks are already done so that this routine can be
- * as fast as possible.
+ * Reassemble:
*****************************************************************************/
-static void RenderSPU( vout_thread_t *p_vout, picture_t *p_pic,
- const subpicture_t *p_spu )
+static block_t *Reassemble( decoder_t *p_dec, block_t **pp_block )
{
- /* Common variables */
- u16 p_clut16[4];
- u32 p_clut32[4];
- u8 *p_dest;
- u8 *p_destptr = (u8 *)p_dest;
- u16 *p_source = (u16 *)p_spu->p_sys->p_data;
-
- int i_x, i_y;
- int i_len, i_color, i_colprecomp, i_destalpha;
- u8 i_cnt;
-
- /* RGB-specific */
- int i_xscale, i_yscale, i_width, i_height, i_ytmp, i_yreal, i_ynext;
-
- switch( p_vout->output.i_chroma )
- {
- /* I420 target, no scaling */
- case VLC_FOURCC('I','4','2','0'):
- case VLC_FOURCC('I','Y','U','V'):
- case VLC_FOURCC('Y','V','1','2'):
-
- p_dest = p_pic->Y_PIXELS + p_spu->i_x + p_spu->i_width
- + p_pic->Y_PITCH * ( p_spu->i_y + p_spu->i_height );
-
- /* Draw until we reach the bottom of the subtitle */
- for( i_y = p_spu->i_height * p_pic->Y_PITCH ;
- i_y ;
- i_y -= p_pic->Y_PITCH )
- {
- /* Draw until we reach the end of the line */
- for( i_x = p_spu->i_width ; i_x ; )
- {
- /* Get the RLE part, then draw the line */
- i_color = *p_source & 0x3;
- i_len = *p_source++ >> 2;
-
- switch( p_spu->p_sys->pi_alpha[ i_color ] )
- {
- case 0x00:
- break;
-
- case 0x0f:
- memset( p_dest - i_x - i_y,
- p_spu->p_sys->pi_yuv[i_color][0], i_len );
- break;
-
- default:
- /* To be able to divide by 16 (>>4) we add 1 to the alpha.
- * This means Alpha 0 won't be completely transparent, but
- * that's handled in a special case above anyway. */
- i_colprecomp = p_spu->p_sys->pi_yuv[i_color][0]
- * (p_spu->p_sys->pi_alpha[ i_color ] + 1);
- i_destalpha = 15 - p_spu->p_sys->pi_alpha[ i_color ];
-
- for ( p_destptr = p_dest - i_x - i_y;
- p_destptr < p_dest - i_x - i_y + i_len;
- p_destptr++ )
- {
- *p_destptr = ( i_colprecomp +
- *p_destptr * i_destalpha ) >> 4;
- }
- break;
-
- }
- i_x -= i_len;
- }
- }
-
- break;
-
- /* RV16 target, scaling */
- case VLC_FOURCC('R','V','1','6'):
-
- /* XXX: this is a COMPLETE HACK, memcpy is unable to do u16s anyway */
- /* FIXME: get this from the DVD */
- for( i_color = 0; i_color < 4; i_color++ )
- {
- p_clut16[i_color] = 0x1111
- * ( (u16)p_spu->p_sys->pi_yuv[i_color][0] >> 4 );
- }
-
- i_xscale = ( p_vout->output.i_width << 6 ) / p_vout->render.i_width;
- i_yscale = ( p_vout->output.i_height << 6 ) / p_vout->render.i_height;
-
- i_width = p_spu->i_width * i_xscale;
- i_height = p_spu->i_height * i_yscale;
-
- p_dest = p_pic->p->p_pixels + ( i_width >> 6 ) * 2
- /* Add the picture coordinates and the SPU coordinates */
- + ( (p_spu->i_x * i_xscale) >> 6 ) * 2
- + ( (p_spu->i_y * i_yscale) >> 6 ) * p_pic->p->i_pitch;
-
- /* Draw until we reach the bottom of the subtitle */
- for( i_y = 0 ; i_y < i_height ; )
- {
- i_ytmp = i_y >> 6;
- i_y += i_yscale;
-
- /* Check whether we need to draw one line or more than one */
- if( i_ytmp + 1 >= ( i_y >> 6 ) )
- {
- /* Just one line : we precalculate i_y >> 6 */
- i_yreal = p_pic->p->i_pitch * i_ytmp;
-
- /* Draw until we reach the end of the line */
- for( i_x = i_width ; i_x ; )
- {
- /* Get the RLE part, then draw the line */
- i_color = *p_source & 0x3;
-
- switch( p_spu->p_sys->pi_alpha[ i_color ] )
- {
- case 0x00:
- i_x -= i_xscale * ( *p_source++ >> 2 );
- break;
-
- case 0x0f:
- i_len = i_xscale * ( *p_source++ >> 2 );
- memset( p_dest - 2 * ( i_x >> 6 ) + i_yreal,
- p_clut16[ i_color ],
- 2 * ( ( i_len >> 6 ) + 1 ) );
- i_x -= i_len;
- break;
-
- default:
- /* FIXME: we should do transparency */
- i_len = i_xscale * ( *p_source++ >> 2 );
- memset( p_dest - 2 * ( i_x >> 6 ) + i_yreal,
- p_clut16[ i_color ],
- 2 * ( ( i_len >> 6 ) + 1 ) );
- i_x -= i_len;
- break;
- }
-
- }
- }
- else
- {
- i_yreal = p_pic->p->i_pitch * i_ytmp;
- i_ynext = p_pic->p->i_pitch * i_y >> 6;
-
- /* Draw until we reach the end of the line */
- for( i_x = i_width ; i_x ; )
- {
- /* Get the RLE part, then draw as many lines as needed */
- i_color = *p_source & 0x3;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_block;
- switch( p_spu->p_sys->pi_alpha[ i_color ] )
- {
- case 0x00:
- i_x -= i_xscale * ( *p_source++ >> 2 );
- break;
+ if( pp_block == NULL || *pp_block == NULL ) return NULL;
+ p_block = *pp_block;
+ *pp_block = NULL;
- case 0x0f:
- i_len = i_xscale * ( *p_source++ >> 2 );
- for( i_ytmp = i_yreal ; i_ytmp < i_ynext ;
- i_ytmp += p_pic->p->i_pitch )
- {
- memset( p_dest - 2 * ( i_x >> 6 ) + i_ytmp,
- p_clut16[ i_color ],
- 2 * ( ( i_len >> 6 ) + 1 ) );
- }
- i_x -= i_len;
- break;
-
- default:
- /* FIXME: we should do transparency */
- i_len = i_xscale * ( *p_source++ >> 2 );
- for( i_ytmp = i_yreal ; i_ytmp < i_ynext ;
- i_ytmp += p_pic->p->i_pitch )
- {
- memset( p_dest - 2 * ( i_x >> 6 ) + i_ytmp,
- p_clut16[ i_color ],
- 2 * ( ( i_len >> 6 ) + 1 ) );
- }
- i_x -= i_len;
- break;
- }
- }
- }
- }
-
- break;
-
- /* RV32 target, scaling */
- case VLC_FOURCC('R','V','2','4'):
- case VLC_FOURCC('R','V','3','2'):
-
- /* XXX: this is a COMPLETE HACK, memcpy is unable to do u32s anyway */
- /* FIXME: get this from the DVD */
- for( i_color = 0; i_color < 4; i_color++ )
+ if( p_sys->i_spu_size <= 0 &&
+ ( p_block->i_pts <= 0 || p_block->i_buffer < 4 ) )
{
- p_clut32[i_color] = 0x11111111
- * ( (u16)p_spu->p_sys->pi_yuv[i_color][0] >> 4 );
+ msg_Dbg( p_dec, "invalid starting packet (size < 4 or pts <=0)" );
+ msg_Dbg( p_dec, "spu size: %d, i_pts: %"PRId64" i_buffer: %zu",
+ p_sys->i_spu_size, p_block->i_pts, p_block->i_buffer );
+ block_Release( p_block );
+ return NULL;
}
- i_xscale = ( p_vout->output.i_width << 6 ) / p_vout->render.i_width;
- i_yscale = ( p_vout->output.i_height << 6 ) / p_vout->render.i_height;
-
- i_width = p_spu->i_width * i_xscale;
- i_height = p_spu->i_height * i_yscale;
-
- p_dest = p_pic->p->p_pixels + ( i_width >> 6 ) * 4
- /* Add the picture coordinates and the SPU coordinates */
- + ( (p_spu->i_x * i_xscale) >> 6 ) * 4
- + ( (p_spu->i_y * i_yscale) >> 6 ) * p_pic->p->i_pitch;
+ block_ChainAppend( &p_sys->p_block, p_block );
+ p_sys->i_spu += p_block->i_buffer;
- /* Draw until we reach the bottom of the subtitle */
- for( i_y = 0 ; i_y < i_height ; )
+ if( p_sys->i_spu_size <= 0 )
{
- i_ytmp = i_y >> 6;
- i_y += i_yscale;
+ p_sys->i_spu_size = ( p_block->p_buffer[0] << 8 )|
+ p_block->p_buffer[1];
+ p_sys->i_rle_size = ( ( p_block->p_buffer[2] << 8 )|
+ p_block->p_buffer[3] ) - 4;
- /* Check whether we need to draw one line or more than one */
- if( i_ytmp + 1 >= ( i_y >> 6 ) )
- {
- /* Just one line : we precalculate i_y >> 6 */
- i_yreal = p_pic->p->i_pitch * i_ytmp;
-
- /* Draw until we reach the end of the line */
- for( i_x = i_width ; i_x ; )
- {
- /* Get the RLE part, then draw the line */
- i_color = *p_source & 0x3;
-
- switch( p_spu->p_sys->pi_alpha[ i_color ] )
- {
- case 0x00:
- i_x -= i_xscale * ( *p_source++ >> 2 );
- break;
-
- case 0x0f:
- i_len = i_xscale * ( *p_source++ >> 2 );
- memset( p_dest - 4 * ( i_x >> 6 ) + i_yreal,
- p_clut32[ i_color ], 4 * ( ( i_len >> 6 ) + 1 ) );
- i_x -= i_len;
- break;
+ /* msg_Dbg( p_dec, "i_spu_size=%d i_rle=%d",
+ p_sys->i_spu_size, p_sys->i_rle_size ); */
- default:
- /* FIXME: we should do transparency */
- i_len = i_xscale * ( *p_source++ >> 2 );
- memset( p_dest - 4 * ( i_x >> 6 ) + i_yreal,
- p_clut32[ i_color ], 4 * ( ( i_len >> 6 ) + 1 ) );
- i_x -= i_len;
- break;
- }
-
- }
- }
- else
+ if( p_sys->i_spu_size <= 0 || p_sys->i_rle_size >= p_sys->i_spu_size )
{
- i_yreal = p_pic->p->i_pitch * i_ytmp;
- i_ynext = p_pic->p->i_pitch * i_y >> 6;
-
- /* Draw until we reach the end of the line */
- for( i_x = i_width ; i_x ; )
- {
- /* Get the RLE part, then draw as many lines as needed */
- i_color = *p_source & 0x3;
+ p_sys->i_spu_size = 0;
+ p_sys->i_rle_size = 0;
+ p_sys->i_spu = 0;
+ p_sys->p_block = NULL;
- switch( p_spu->p_sys->pi_alpha[ i_color ] )
- {
- case 0x00:
- i_x -= i_xscale * ( *p_source++ >> 2 );
- break;
-
- case 0x0f:
- i_len = i_xscale * ( *p_source++ >> 2 );
- for( i_ytmp = i_yreal ; i_ytmp < i_ynext ;
- i_ytmp += p_pic->p->i_pitch )
- {
- memset( p_dest - 4 * ( i_x >> 6 ) + i_ytmp,
- p_clut32[ i_color ],
- 4 * ( ( i_len >> 6 ) + 1 ) );
- }
- i_x -= i_len;
- break;
-
- default:
- /* FIXME: we should do transparency */
- i_len = i_xscale * ( *p_source++ >> 2 );
- for( i_ytmp = i_yreal ; i_ytmp < i_ynext ;
- i_ytmp += p_pic->p->i_pitch )
- {
- memset( p_dest - 4 * ( i_x >> 6 ) + i_ytmp,
- p_clut32[ i_color ],
- 4 * ( ( i_len >> 6 ) + 1 ) );
- }
- i_x -= i_len;
- break;
- }
- }
+ block_Release( p_block );
+ return NULL;
}
}
- break;
-
- /* NVidia overlay, no scaling */
- case VLC_FOURCC('Y','U','Y','2'):
-
- p_dest = p_pic->p->p_pixels +
- (p_spu->i_x + p_spu->i_width +
- p_vout->output.i_width * ( p_spu->i_y + p_spu->i_height )) * 2;
- /* Draw until we reach the bottom of the subtitle */
- for( i_y = p_spu->i_height * p_vout->output.i_width;
- i_y ;
- i_y -= p_vout->output.i_width )
+ if( p_sys->i_spu >= p_sys->i_spu_size )
{
- /* Draw until we reach the end of the line */
- for( i_x = p_spu->i_width ; i_x ; )
- {
- /* Get the RLE part, then draw the line */
- i_color = *p_source & 0x3;
-
- switch( p_spu->p_sys->pi_alpha[ i_color ] )
- {
- case 0x00:
- i_x -= *p_source++ >> 2;
- break;
-
- case 0x0f:
- i_len = *p_source++ >> 2;
- for( i_cnt = 0; i_cnt < i_len; i_cnt++ )
- {
- /* draw a pixel */
- /* Y */
- memset( p_dest - i_x * 2 - i_y * 2 + i_cnt * 2,
- p_spu->p_sys->pi_yuv[i_color][0], 1);
-
- if (!(i_cnt & 0x01))
- {
- /* U and V */
- memset( p_dest - i_x * 2 - i_y * 2 + i_cnt * 2 + 1,
- 0x80, 1);
- memset( p_dest - i_x * 2 - i_y * 2 + i_cnt * 2 + 3,
- 0x80, 1);
- }
- }
- i_x -= i_len;
- break;
-
- default:
- /* FIXME: we should do transparency */
- i_len = *p_source++ >> 2;
- for( i_cnt = 0; i_cnt < i_len; i_cnt++ )
- {
- /* draw a pixel */
- /* Y */
- memset( p_dest - i_x * 2 - i_y * 2 + i_cnt * 2,
- p_spu->p_sys->pi_yuv[i_color][0], 1);
-
- if (!(i_cnt & 0x01))
- {
- /* U and V */
- memset( p_dest - i_x * 2 - i_y * 2 + i_cnt * 2 + 1,
- 0x80, 1);
- memset( p_dest - i_x * 2 - i_y * 2 + i_cnt * 2 + 3,
- 0x80, 1);
- }
- }
- i_x -= i_len;
- break;
- }
- }
- }
-
- break;
-
+ /* We have a complete sub */
+ if( p_sys->i_spu > p_sys->i_spu_size )
+ msg_Dbg( p_dec, "SPU packets size=%d should be %d",
+ p_sys->i_spu, p_sys->i_spu_size );
- default:
- msg_Err( p_vout, "unknown chroma, can't render SPU" );
- break;
+ return p_sys->p_block;
}
+ return NULL;
}
projects / vlc / blobdiff