/*****************************************************************************
- * dvbsub.c : DVB subtitles decoder thread
+ * dvbsub.c : DVB subtitles decoder
+ * DVB subtitles encoder (developed for Anevia, www.anevia.com)
*****************************************************************************
* Copyright (C) 2003 ANEVIA
- * $Id: dvbsub.c,v 1.4 2003/11/22 23:39:14 fenrir Exp $
+ * Copyright (C) 2003-2005 the VideoLAN team
+ * $Id$
*
- * Authors: Damien LUCAS <damien.lucas@anevia.com>
+ * Authors: Gildas Bazin <gbazin@videolan.org>
+ * Damien LUCAS <damien.lucas@anevia.com>
+ * Laurent Aimar <fenrir@via.ecp.fr>
+ * Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
+ * Derk-Jan Hartman <hartman #at# videolan dot org>
*
* 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
*
* 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
+ *
+ * FIXME:
+ * DVB subtitles coded as strings of characters are not handled correctly.
+ * The character codes in the string should actually be indexes referring to a
+ * character table identified in the subtitle descriptor.
+ *
+ * The spec is quite vague in this area, but what is meant is perhaps that it
+ * refers to the character index in the codepage belonging to the language specified
+ * in the subtitle descriptor. Potentially it's designed for widechar
+ * (but not for UTF-*) codepages.
*****************************************************************************/
#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/decoder.h>
+#include <vlc_vout.h>
+#include <vlc_codec.h>
+#include <vlc_sout.h>
-#include "codecs.h"
+#include "vlc_bits.h"
-// Wow, that's ugly but very usefull for a memory leak track
-// so I just keep it
-#if 0
-static long long unsigned int trox_malloc_nb = 0;
-static long long unsigned int trox_free_nb = 0;
+/* #define DEBUG_DVBSUB 1 */
-static void* trox_malloc (size_t size)
-{ ++trox_malloc_nb; return malloc (size); }
+#define POSX_TEXT N_("Decoding X coordinate")
+#define POSX_LONGTEXT N_("X coordinate of the rendered subtitle")
-static void trox_free (void* ptr)
-{ ++trox_free_nb; free(ptr); return; }
+#define POSY_TEXT N_("Decoding Y coordinate")
+#define POSY_LONGTEXT N_("Y coordinate of the rendered subtitle")
+
+#define POS_TEXT N_("Subpicture position")
+#define POS_LONGTEXT N_( \
+ "You can enforce the subpicture position on the video " \
+ "(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \
+ "also use combinations of these values, e.g. 6=top-right).")
+
+#define ENC_POSX_TEXT N_("Encoding X coordinate")
+#define ENC_POSX_LONGTEXT N_("X coordinate of the encoded subtitle" )
+#define ENC_POSY_TEXT N_("Encoding Y coordinate")
+#define ENC_POSY_LONGTEXT N_("Y coordinate of the encoded subtitle" )
+
+static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *ppsz_pos_descriptions[] =
+{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
+ N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
+
+/*****************************************************************************
+ * Module descriptor.
+ *****************************************************************************/
+static int Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
+static subpicture_t *Decode( decoder_t *, block_t ** );
+
+static int OpenEncoder ( vlc_object_t * );
+static void CloseEncoder( vlc_object_t * );
+static block_t *Encode ( encoder_t *, subpicture_t * );
+
+vlc_module_begin();
+# define DVBSUB_CFG_PREFIX "dvbsub-"
+ set_description( _("DVB subtitles decoder") );
+ set_capability( "decoder", 50 );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_SCODEC );
+ set_callbacks( Open, Close );
+
+ add_integer( DVBSUB_CFG_PREFIX "position", 8, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );
+ change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+ add_integer( DVBSUB_CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE );
+ add_integer( DVBSUB_CFG_PREFIX "y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE );
+
+# define ENC_CFG_PREFIX "sout-dvbsub-"
+ add_submodule();
+ set_description( _("DVB subtitles encoder") );
+ set_capability( "encoder", 100 );
+ set_callbacks( OpenEncoder, CloseEncoder );
+
+ add_integer( ENC_CFG_PREFIX "x", -1, NULL, ENC_POSX_TEXT, ENC_POSX_LONGTEXT, VLC_FALSE );
+ add_integer( ENC_CFG_PREFIX "y", -1, NULL, ENC_POSY_TEXT, ENC_POSY_LONGTEXT, VLC_FALSE );
+ add_obsolete_integer( ENC_CFG_PREFIX "timeout" ); /* Suppressed since 0.8.5 */
+vlc_module_end();
+
+static const char *ppsz_enc_options[] = { "x", "y", NULL };
-static void trox_call ()
-{
- fprintf(stderr, "dvbbsub -- Memory usage: %llu mallocs %llu frees (%llu)\n",
- trox_malloc_nb,
- trox_free_nb,
- trox_malloc_nb - trox_free_nb);
- return;
-}
-#else
-# define trox_malloc malloc
-# define trox_free free
-# define trox_call()
-#endif
/****************************************************************************
* Local structures
****************************************************************************
* Those structures refer closely to the ETSI 300 743 Object model
****************************************************************************/
-/* Storage of a RLE entry */
-typedef struct dvbsub_rle_s
-{
- uint16_t i_num;
- uint8_t i_color_code;
- uint8_t y;
- uint8_t cr;
- uint8_t cb;
- uint8_t t;
- struct dvbsub_rle_s* p_next;
-} dvbsub_rle_t;
-
-/* A subpicture image is a list of codes
- * We need to store the length of each line since nothing specify in
- * the standard that all lines shoudl have the same length
- * WARNING: We assume here that a spu is less than 576 lines high */
-typedef struct
-{
- uint16_t i_rows;
- uint16_t i_cols[576];
- dvbsub_rle_t* p_last;
- dvbsub_rle_t* p_codes;
-} dvbsub_image_t;
-
-/* The object definition gives the position of the object in a region */
+/* The object definition gives the position of the object in a region [7.2.5] */
typedef struct dvbsub_objectdef_s
{
- uint16_t i_id;
- uint8_t i_type;
- uint8_t i_provider;
- uint16_t i_xoffset;
- uint16_t i_yoffset;
- uint8_t i_fg_pc;
- uint8_t i_bg_pc;
- struct dvbsub_objectdef_s* p_next;
-} dvbsub_objectdef_t;
-
-/* The Region is an aera on the image
- * with a list of the object definitions associated
- * and a CLUT */
-typedef struct dvbsub_region_s
-{
- uint8_t i_id;
- uint8_t i_version_number;
- vlc_bool_t b_fill;
- uint16_t i_x;
- uint16_t i_y;
- uint16_t i_width;
- uint16_t i_height;
- uint8_t i_level_comp;
- uint8_t i_depth;
- uint8_t i_clut;
- uint8_t i_8bp_code;
- uint8_t i_4bp_code;
- uint8_t i_2bp_code;
- dvbsub_objectdef_t* p_object;
-} dvbsub_region_t;
-
-/* The page defines the list of regions */
-typedef struct
-{
- uint16_t i_id;
- uint8_t i_timeout;
- uint8_t i_state;
- uint8_t i_version_number;
- uint8_t i_regions_number;
- dvbsub_region_t* regions;
-} dvbsub_page_t;
+ int i_id;
+ int i_type;
+ int i_x;
+ int i_y;
+ int i_fg_pc;
+ int i_bg_pc;
+ char *psz_text; /* for string of characters objects */
-/* An object is constituted of 2 images (for interleaving) */
-typedef struct dvbsub_object_s
-{
- uint16_t i_id;
- uint8_t i_version_number;
- uint8_t i_coding_method;
- vlc_bool_t b_non_modify_color;
- dvbsub_image_t* topfield;
- dvbsub_image_t* bottomfield;
- struct dvbsub_object_s* p_next;
-} dvbsub_object_t;
+} dvbsub_objectdef_t;
/* The entry in the palette CLUT */
typedef struct
uint8_t Cr;
uint8_t Cb;
uint8_t T;
+
} dvbsub_color_t;
-/* */
-typedef struct
+/* The displays dimensions [7.2.1] */
+typedef struct dvbsub_display_s
+{
+ uint8_t i_id;
+ uint8_t i_version;
+
+ int i_width;
+ int i_height;
+
+ vlc_bool_t b_windowed;
+ int i_x;
+ int i_y;
+ int i_max_x;
+ int i_max_y;
+
+} dvbsub_display_t;
+
+/* [7.2.4] */
+typedef struct dvbsub_clut_s
{
uint8_t i_id;
- uint8_t i_version_number;
- dvbsub_color_t c_2b[0xff];
- dvbsub_color_t c_4b[0xff];
- dvbsub_color_t c_8b[0xff];
+ uint8_t i_version;
+ dvbsub_color_t c_2b[4];
+ dvbsub_color_t c_4b[16];
+ dvbsub_color_t c_8b[256];
+
+ struct dvbsub_clut_s *p_next;
+
} dvbsub_clut_t;
-typedef struct
+/* The Region is an aera on the image [7.2.3]
+ * with a list of the object definitions associated and a CLUT */
+typedef struct dvbsub_region_s
{
- uint8_t i_x;
- uint16_t i_y;
- dvbsub_image_t* p_rle_top;
- dvbsub_image_t* p_rle_bot;
-} dvbsub_render_t;
+ int i_id;
+ int i_version;
+ int i_x;
+ int i_y;
+ int i_width;
+ int i_height;
+ int i_level_comp;
+ int i_depth;
+ int i_clut;
-typedef struct
+ uint8_t *p_pixbuf;
+
+ int i_object_defs;
+ dvbsub_objectdef_t *p_object_defs;
+
+ struct dvbsub_region_s *p_next;
+
+} dvbsub_region_t;
+
+/* The object definition gives the position of the object in a region */
+typedef struct dvbsub_regiondef_s
{
- dvbsub_clut_t* p_clut[0xff];
- dvbsub_page_t* p_page;
- dvbsub_object_t* p_objects;
- subpicture_t* p_spu[16];
-} dvbsub_all_t;
+ int i_id;
+ int i_x;
+ int i_y;
+
+} dvbsub_regiondef_t;
+
+/* The page defines the list of regions [7.2.2] */
typedef struct
{
- /* Thread properties and locks */
- vlc_thread_t thread_id; /* Id for thread functions */
- /* Input properties */
- decoder_fifo_t* p_fifo; /* Stores the PES stream data */
- bit_stream_t bit_stream; /* PES data at the bit level */
- /* Output properties */
- vout_thread_t* p_vout; /* Needed to create the subpictures */
-} dvbsub_thread_t;
-struct subpicture_sys_t
+ int i_id;
+ int i_timeout; /* in seconds */
+ int i_state;
+ int i_version;
+
+ int i_region_defs;
+ dvbsub_regiondef_t *p_region_defs;
+
+} dvbsub_page_t;
+
+struct decoder_sys_t
{
+ bs_t bs;
+
+ /* Decoder internal data */
+ int i_id;
+ int i_ancillary_id;
mtime_t i_pts;
- void * p_data; /* rle datas are stored */
- vlc_object_t* p_input; /* Link to the input */
- vlc_bool_t b_obsolete;
+
+ vlc_bool_t b_absolute;
+ int i_spu_position;
+ int i_spu_x;
+ int i_spu_y;
+
+ vlc_bool_t b_page;
+ dvbsub_page_t *p_page;
+ dvbsub_region_t *p_regions;
+ dvbsub_clut_t *p_cluts;
+ dvbsub_display_t *p_display;
+ dvbsub_clut_t default_clut;
};
-// List of different SEGMENT TYPES
-// According to EN 300-743, table 2
+
+
+/* List of different SEGMENT TYPES */
+/* According to EN 300-743, table 2 */
#define DVBSUB_ST_PAGE_COMPOSITION 0x10
#define DVBSUB_ST_REGION_COMPOSITION 0x11
#define DVBSUB_ST_CLUT_DEFINITION 0x12
#define DVBSUB_ST_OBJECT_DATA 0x13
+#define DVBSUB_ST_DISPLAY_DEFINITION 0x14
#define DVBSUB_ST_ENDOFDISPLAY 0x80
#define DVBSUB_ST_STUFFING 0xff
-// List of different OBJECT TYPES
-// According to EN 300-743, table 6
+/* List of different OBJECT TYPES */
+/* According to EN 300-743, table 6 */
#define DVBSUB_OT_BASIC_BITMAP 0x00
#define DVBSUB_OT_BASIC_CHAR 0x01
#define DVBSUB_OT_COMPOSITE_STRING 0x02
-// Pixel DATA TYPES
-// According to EN 300-743, table 9
+/* Pixel DATA TYPES */
+/* According to EN 300-743, table 9 */
#define DVBSUB_DT_2BP_CODE_STRING 0x10
#define DVBSUB_DT_4BP_CODE_STRING 0x11
#define DVBSUB_DT_8BP_CODE_STRING 0x12
#define DVBSUB_DT_28_TABLE_DATA 0x21
#define DVBSUB_DT_48_TABLE_DATA 0x22
#define DVBSUB_DT_END_LINE 0xf0
+/* List of different Page Composition Segment state */
+/* According to EN 300-743, 7.2.1 table 3 */
+#define DVBSUB_PCS_STATE_ACQUISITION 0x01
+#define DVBSUB_PCS_STATE_CHANGE 0x02
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int OpenDecoder ( vlc_object_t * );
-static int RunDecoder ( decoder_fifo_t * );
-static int InitThread ( dvbsub_thread_t * );
-static void EndThread ( dvbsub_thread_t *i, dvbsub_all_t*);
-static vout_thread_t *FindVout( dvbsub_thread_t * );
-static void RenderI42x( vout_thread_t *, picture_t *, const subpicture_t *,
- vlc_bool_t );
-static void RenderYUY2( vout_thread_t *, picture_t *, const subpicture_t *,
- vlc_bool_t );
-static void dvbsub_clut_add_entry ( dvbsub_clut_t* clut, uint8_t type,
- uint8_t id, uint8_t y, uint8_t cr,
- uint8_t cb, uint8_t t);
-static void dvbsub_add_objectdef_to_region ( dvbsub_objectdef_t* p_obj,
- dvbsub_region_t* p_region );
-static dvbsub_image_t* dvbsub_parse_pdata ( dvbsub_thread_t* ,uint16_t );
-static uint16_t dvbsub_count0x11(dvbsub_thread_t* p_spudec,
- uint16_t* p,
- dvbsub_image_t* p_image);
-static void dvbsub_decode_segment ( dvbsub_thread_t *, dvbsub_all_t* );
-static void dvbsub_decode_page_composition ( dvbsub_thread_t *, dvbsub_all_t* );
-static void dvbsub_decode_region_composition ( dvbsub_thread_t*, dvbsub_all_t*);
-static void dvbsub_decode_object ( dvbsub_thread_t*, dvbsub_all_t* );
-static vlc_bool_t dvbsub_check_page ( dvbsub_all_t* );
-static void dvbsub_render ( dvbsub_thread_t *p_spudec,dvbsub_all_t* );
-static int dvbsub_parse ( dvbsub_thread_t *p_spudec, dvbsub_all_t* dvbsub );
-static void dvbsub_decode_clut ( dvbsub_thread_t*, dvbsub_all_t*);
-static void dvbsub_stop_display ( dvbsub_thread_t* p_dec, dvbsub_all_t* dvbsub);
-
-static void free_image (dvbsub_image_t* p_i);
-static void free_object (dvbsub_object_t* p_o);
-static void free_regions (dvbsub_region_t* p_r, uint8_t nb);
-static void free_objects (dvbsub_object_t* p_o);
-static void free_clut ( dvbsub_clut_t* p_c);
-static void free_page (dvbsub_page_t* p_p);
-static void free_all ( dvbsub_all_t* p_a );
+static void decode_segment( decoder_t *, bs_t * );
+static void decode_page_composition( decoder_t *, bs_t * );
+static void decode_region_composition( decoder_t *, bs_t * );
+static void decode_object( decoder_t *, bs_t * );
+static void decode_display_definition( decoder_t *, bs_t * );
+static void decode_clut( decoder_t *, bs_t * );
+static void free_all( decoder_t * );
+static void default_clut_init( decoder_t * );
+
+static subpicture_t *render( decoder_t * );
/*****************************************************************************
- * Module descriptor.
- *****************************************************************************/
-vlc_module_begin();
- add_category_hint( N_("subtitles"), NULL, VLC_TRUE );
- set_description( _("subtitles decoder") );
- set_capability( "decoder", 50 );
- set_callbacks( OpenDecoder, NULL );
-vlc_module_end();
-/*****************************************************************************
- * OpenDecoder: probe the decoder and return score
+ * Open: probe the decoder and return score
*****************************************************************************
* Tries to launch a decoder and return score so that the interface is able
* to chose.
*****************************************************************************/
-static int OpenDecoder( vlc_object_t *p_this )
+static int Open( vlc_object_t *p_this )
{
- decoder_t *p_dec = (decoder_t*) p_this;
+ decoder_t *p_dec = (decoder_t *) p_this;
+ decoder_sys_t *p_sys;
+ vlc_value_t val;
+ int i_posx, i_posy;
+
if( p_dec->fmt_in.i_codec != VLC_FOURCC('d','v','b','s') )
{
return VLC_EGENERIC;
}
- p_dec->pf_run = RunDecoder;
- return VLC_SUCCESS;
-}
-/*****************************************************************************
- * RunDecoder: this function is called just after the thread is created
- *****************************************************************************/
-static int RunDecoder( decoder_fifo_t * p_fifo )
-{
- dvbsub_thread_t * p_dvbsubdec;
-// vout_thread_t * p_vout_backup = NULL;
- dvbsub_all_t dvbsub;
- unsigned int k;
- /* Allocate the memory needed to store the thread's structure */
- p_dvbsubdec = (dvbsub_thread_t *)trox_malloc( sizeof(dvbsub_thread_t) );
- if ( p_dvbsubdec == NULL )
- {
- msg_Err( p_fifo, "out of memory" );
- DecoderError( p_fifo );
- return( -1 );
- }
- /*
- * Initialize the thread properties
- */
- p_dvbsubdec->p_vout = NULL;
- p_dvbsubdec->p_fifo = p_fifo;
- /*
- * Initialize thread and free configuration
- */
- p_dvbsubdec->p_fifo->b_error = InitThread( p_dvbsubdec );
- dvbsub.p_page=NULL;
- dvbsub.p_objects=NULL;
- for(k=0; k<0xff; k++) dvbsub.p_clut[k] = NULL;
- for(k=0; k<16; k++) dvbsub.p_spu[k] = NULL;
-
- /*
- * Main loop - it is not executed if an error occured during
- * initialization
- */
- while( (!p_dvbsubdec->p_fifo->b_die) && (!p_dvbsubdec->p_fifo->b_error) )
+
+ p_dec->pf_decode_sub = Decode;
+ p_sys = p_dec->p_sys = malloc( sizeof(decoder_sys_t) );
+ if( !p_sys )
{
- dvbsub_parse( p_dvbsubdec, &dvbsub );
- p_dvbsubdec->p_vout = FindVout( p_dvbsubdec );
- if( p_dvbsubdec->p_vout )
- {
- // Check if the page is to be displayed
- if(dvbsub_check_page(&dvbsub))
- {
- dvbsub_render(p_dvbsubdec, &dvbsub);
- }
- vlc_object_release( p_dvbsubdec->p_vout );
- }
+ msg_Err( p_dec, "out of memory" );
+ return VLC_ENOMEM;
}
- // Free all structures
- //dvbsub.p_objects=NULL;
- //for(k=0; k<16; k++)
- // if(dvbsub.p_spu[k] != NULL)
- // dvbsub.p_spu[k]->p_sys->b_obsolete = 1;
-
- /*
- * Error loop
- */
- if( p_dvbsubdec->p_fifo->b_error )
+ memset( p_sys, 0, sizeof(decoder_sys_t) );
+
+ p_sys->i_pts = (mtime_t) 0;
+ p_sys->i_id = p_dec->fmt_in.subs.dvb.i_id & 0xFFFF;
+ p_sys->i_ancillary_id = p_dec->fmt_in.subs.dvb.i_id >> 16;
+
+ p_sys->p_regions = NULL;
+ p_sys->p_cluts = NULL;
+ p_sys->p_page = NULL;
+ p_sys->p_display = NULL;
+
+ var_Create( p_this, DVBSUB_CFG_PREFIX "position",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_this, DVBSUB_CFG_PREFIX "position", &val );
+ p_sys->i_spu_position = val.i_int;
+ var_Create( p_this, DVBSUB_CFG_PREFIX "x",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_this, DVBSUB_CFG_PREFIX "x", &val );
+ i_posx = val.i_int;
+ var_Create( p_this, DVBSUB_CFG_PREFIX "y",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_this, DVBSUB_CFG_PREFIX "y", &val );
+ i_posy = val.i_int;
+
+ /* Check if subpicture position was overridden */
+ p_sys->b_absolute = VLC_TRUE;
+ p_sys->i_spu_x = p_sys->i_spu_y = 0;
+
+ if( i_posx >= 0 && i_posy >= 0 )
{
- DecoderError( p_dvbsubdec->p_fifo );
- /* End of thread */
- EndThread( p_dvbsubdec, &dvbsub );
- return -1;
+ p_sys->b_absolute = VLC_FALSE;
+ p_sys->i_spu_x = i_posx;
+ p_sys->i_spu_y = i_posy;
}
- /* End of thread */
- EndThread( p_dvbsubdec, &dvbsub );
- free_all(&dvbsub);
- return 0;
+
+ es_format_Init( &p_dec->fmt_out, SPU_ES, VLC_FOURCC( 'd','v','b','s' ) );
+
+ default_clut_init( p_dec );
+
+ return VLC_SUCCESS;
}
-/* following functions are local */
+
/*****************************************************************************
- * InitThread: initialize dvbsub 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.
+ * Close:
*****************************************************************************/
-static int InitThread( dvbsub_thread_t *p_dvbsubdec )
+static void Close( vlc_object_t *p_this )
{
- int i_ret;
- /* Call InitBitstream anyway so p_spudec->bit_stream is in a known
- * state before calling CloseBitstream */
- i_ret = InitBitstream( &p_dvbsubdec->bit_stream, p_dvbsubdec->p_fifo,
- NULL, NULL );
- /* Check for a video output */
- p_dvbsubdec->p_vout = FindVout( p_dvbsubdec );
- if( !p_dvbsubdec->p_vout )
- {
- return -1;
- }
- /* It was just a check */
- vlc_object_release( p_dvbsubdec->p_vout );
- p_dvbsubdec->p_vout = NULL;
- return i_ret;
+ decoder_t *p_dec = (decoder_t*) p_this;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+
+ var_Destroy( p_this, DVBSUB_CFG_PREFIX "x" );
+ var_Destroy( p_this, DVBSUB_CFG_PREFIX "y" );
+ var_Destroy( p_this, DVBSUB_CFG_PREFIX "position" );
+
+ free_all( p_dec );
+ free( p_sys );
}
+
/*****************************************************************************
- * FindVout: Find a vout or wait for one to be created.
+ * Decode:
*****************************************************************************/
-static vout_thread_t *FindVout( dvbsub_thread_t *p_spudec )
+static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
{
- vout_thread_t *p_vout = NULL;
- /* Find an available video output */
- do
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ block_t *p_block;
+ subpicture_t *p_spu = NULL;
+
+ if( pp_block == NULL || *pp_block == NULL ) return NULL;
+ p_block = *pp_block;
+ *pp_block = NULL;
+
+ p_sys->i_pts = p_block->i_pts;
+ if( p_sys->i_pts <= 0 )
{
- if( p_spudec->p_fifo->b_die || p_spudec->p_fifo->b_error )
- {
- break;
- }
- p_vout = vlc_object_find( p_spudec->p_fifo, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
- if( p_vout )
- {
- break;
- }
- msleep( VOUT_OUTMEM_SLEEP );
+#ifdef DEBUG_DVBSUB
+ /* Some DVB channels send stuffing segments in non-dated packets so
+ * don't complain too loudly. */
+ msg_Warn( p_dec, "non dated subtitle" );
+#endif
+ block_Release( p_block );
+ return NULL;
+ }
+
+ bs_init( &p_sys->bs, p_block->p_buffer, p_block->i_buffer );
+
+ if( bs_read( &p_sys->bs, 8 ) != 0x20 ) /* Data identifier */
+ {
+ msg_Dbg( p_dec, "invalid data identifier" );
+ block_Release( p_block );
+ return NULL;
}
- while( 1 );
- return p_vout;
+
+ if( bs_read( &p_sys->bs, 8 ) ) /* Subtitle stream id */
+ {
+ msg_Dbg( p_dec, "invalid subtitle stream id" );
+ block_Release( p_block );
+ return NULL;
+ }
+
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "subtitle packet received: "I64Fd, p_sys->i_pts );
+#endif
+
+ p_sys->b_page = VLC_FALSE;
+ while( bs_show( &p_sys->bs, 8 ) == 0x0f ) /* Sync byte */
+ {
+ decode_segment( p_dec, &p_sys->bs );
+ }
+
+ if( bs_read( &p_sys->bs, 8 ) != 0xff ) /* End marker */
+ {
+ msg_Warn( p_dec, "end marker not found (corrupted subtitle ?)" );
+ block_Release( p_block );
+ return NULL;
+ }
+
+ /* Check if the page is to be displayed */
+ if( p_sys->p_page && p_sys->b_page ) p_spu = render( p_dec );
+
+ block_Release( p_block );
+
+ return p_spu;
}
+
+/* following functions are local */
+
/*****************************************************************************
- * EndThread: thread destruction
- *****************************************************************************
- * This function is called when the thread ends after a sucessful
- * initialization.
+ * default_clut_init: default clut as defined in EN 300-743 section 10
*****************************************************************************/
-static void EndThread( dvbsub_thread_t *p_dvbsubdec, dvbsub_all_t* p_dvbsub )
+static void default_clut_init( decoder_t *p_dec )
{
- if( p_dvbsubdec->p_vout != NULL
- && p_dvbsubdec->p_vout->p_subpicture != NULL )
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ uint8_t i;
+
+#define RGB_TO_Y(r, g, b) ((int16_t) 77 * r + 150 * g + 29 * b) / 256;
+#define RGB_TO_U(r, g, b) ((int16_t) -44 * r - 87 * g + 131 * b) / 256;
+#define RGB_TO_V(r, g, b) ((int16_t) 131 * r - 110 * g - 21 * b) / 256;
+
+ /* 4 entries CLUT */
+ for( i = 0; i < 4; i++ )
+ {
+ uint8_t R = 0, G = 0, B = 0, T = 0;
+
+ if( !(i & 0x2) && !(i & 0x1) ) T = 0xFF;
+ else if( !(i & 0x2) && (i & 0x1) ) R = G = B = 0xFF;
+ else if( (i & 0x2) && !(i & 0x1) ) R = G = B = 0;
+ else R = G = B = 0x7F;
+
+ p_sys->default_clut.c_2b[i].Y = RGB_TO_Y(R,G,B);
+ p_sys->default_clut.c_2b[i].Cb = RGB_TO_V(R,G,B);
+ p_sys->default_clut.c_2b[i].Cr = RGB_TO_U(R,G,B);
+ p_sys->default_clut.c_2b[i].T = T;
+ }
+
+ /* 16 entries CLUT */
+ for( i = 0; i < 16; i++ )
{
- subpicture_t * p_subpic;
- int i_subpic;
- for( i_subpic = 0; i_subpic < VOUT_MAX_SUBPICTURES; i_subpic++ )
+ uint8_t R = 0, G = 0, B = 0, T = 0;
+
+ if( !(i & 0x8) )
{
- p_subpic = &p_dvbsubdec->p_vout->p_subpicture[i_subpic];
- if( p_subpic != NULL &&
- ( ( p_subpic->i_status == RESERVED_SUBPICTURE )
- || ( p_subpic->i_status == READY_SUBPICTURE ) ) )
+ if( !(i & 0x4) && !(i & 0x2) && !(i & 0x1) )
+ {
+ T = 0xFF;
+ }
+ else
{
- vout_DestroySubPicture( p_dvbsubdec->p_vout, p_subpic );
+ R = (i & 0x1) ? 0xFF : 0;
+ G = (i & 0x2) ? 0xFF : 0;
+ B = (i & 0x4) ? 0xFF : 0;
}
}
+ else
+ {
+ R = (i & 0x1) ? 0x7F : 0;
+ G = (i & 0x2) ? 0x7F : 0;
+ B = (i & 0x4) ? 0x7F : 0;
+ }
+
+ p_sys->default_clut.c_4b[i].Y = RGB_TO_Y(R,G,B);
+ p_sys->default_clut.c_4b[i].Cr = RGB_TO_V(R,G,B);
+ p_sys->default_clut.c_4b[i].Cb = RGB_TO_U(R,G,B);
+ p_sys->default_clut.c_4b[i].T = T;
}
- CloseBitstream( &p_dvbsubdec->bit_stream );
- trox_free( p_dvbsubdec );
- trox_call();
-}
+ /* 256 entries CLUT */
+ memset( p_sys->default_clut.c_8b, 0xFF, 256 * sizeof(dvbsub_color_t) );
+}
-static int dvbsub_parse ( dvbsub_thread_t *p_spudec,
- dvbsub_all_t* dvbsub )
+static void decode_segment( decoder_t *p_dec, bs_t *s )
{
- unsigned int data_identifier;
- unsigned int subtitle_stream_id;
- unsigned int nextbits;
- uint32_t end_data_marker;
- /* Re-align the buffer on an 8-bit boundary */
- RealignBits( &p_spudec->bit_stream );
- data_identifier = GetBits( &p_spudec->bit_stream, 8 );
- subtitle_stream_id = GetBits( &p_spudec->bit_stream, 8 );
- nextbits = ShowBits( &p_spudec->bit_stream, 8 );
- while(nextbits == 0x0f )
- {
- dvbsub_decode_segment( p_spudec, dvbsub );
- nextbits = ShowBits( &p_spudec->bit_stream, 8 );
- }
- end_data_marker = GetBits( &p_spudec->bit_stream, 8 );
- return 0;
-}
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ int i_type;
+ int i_page_id;
+ int i_size;
+ /* sync_byte (already checked) */
+ bs_skip( s, 8 );
+ /* segment type */
+ i_type = bs_read( s, 8 );
-static void dvbsub_decode_segment ( dvbsub_thread_t * p_spudec,
- dvbsub_all_t * dvbsub )
-{
- unsigned int sync_byte;
- unsigned int segment_type;
- uint16_t page_id;
- uint16_t segment_length;
- int k;
- sync_byte = GetBits( &p_spudec->bit_stream, 8 );
- segment_type = GetBits( &p_spudec->bit_stream, 8 );
- page_id = GetBits( &p_spudec->bit_stream, 16 );
- segment_length = ShowBits( &p_spudec->bit_stream, 16 );
- if( page_id != ((dvb_spuinfo_t*)p_spudec->p_fifo->p_spuinfo)->i_id )
- {
- //TODO should use GetChunk
- for(k=0; k<segment_length+2; k++) GetBits( &p_spudec->bit_stream, 8 );
+ /* page id */
+ i_page_id = bs_read( s, 16 );
+
+ /* segment size */
+ i_size = bs_show( s, 16 );
+
+ if( i_page_id != p_sys->i_id && i_page_id != p_sys->i_ancillary_id )
+ {
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "subtitle skipped (page id: %i, %i)",
+ i_page_id, p_sys->i_id );
+#endif
+ bs_skip( s, 8 * ( 2 + i_size ) );
return;
}
- switch( segment_type )
+
+ if( p_sys->i_ancillary_id != p_sys->i_id &&
+ i_type == DVBSUB_ST_PAGE_COMPOSITION &&
+ i_page_id == p_sys->i_ancillary_id )
{
- case DVBSUB_ST_CLUT_DEFINITION:
- dvbsub_decode_clut ( p_spudec, dvbsub );
- break;
- case DVBSUB_ST_PAGE_COMPOSITION:
- dvbsub_decode_page_composition ( p_spudec, dvbsub );
- break;
- case DVBSUB_ST_REGION_COMPOSITION:
- dvbsub_decode_region_composition ( p_spudec, dvbsub );
- break;
- case DVBSUB_ST_OBJECT_DATA:
- dvbsub_decode_object ( p_spudec, dvbsub );
- break;
- case DVBSUB_ST_ENDOFDISPLAY:
- dvbsub_stop_display ( p_spudec, dvbsub);
- break;
- case DVBSUB_ST_STUFFING:
- default:
- fprintf(stderr, "*** DVBSUB - Unsupported segment type ! (%04x)\n",
- segment_type );
- GetBits( &p_spudec->bit_stream, 16 );
- for(k=0; k<segment_length; k++)
- GetBits( &p_spudec->bit_stream, 8 );
- break;
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "skipped invalid ancillary subtitle packet" );
+#endif
+ bs_skip( s, 8 * ( 2 + i_size ) );
+ return;
}
- return;
-}
+#ifdef DEBUG_DVBSUB
+ if( i_page_id == p_sys->i_id )
+ msg_Dbg( p_dec, "segment (id: %i)", i_page_id );
+ else
+ msg_Dbg( p_dec, "ancillary segment (id: %i)", i_page_id );
+#endif
-static void dvbsub_decode_page_composition (dvbsub_thread_t *p_spudec,
- dvbsub_all_t *dvbsub)
-{
- unsigned int i_version_number;
- unsigned int i_state;
- unsigned int i_segment_length;
- uint8_t i_timeout;
- unsigned int k;
- i_segment_length = GetBits( &p_spudec->bit_stream, 16 );
- //A page is composed by one or more region:
- i_timeout = GetBits( &p_spudec->bit_stream, 8 );
- i_version_number = GetBits( &p_spudec->bit_stream, 4 );
- i_state = GetBits( &p_spudec->bit_stream, 2 );
- // TODO We assume it is a new page (i_state)
- if (dvbsub->p_page) free_page(dvbsub->p_page);
-
- GetBits( &p_spudec->bit_stream, 2 ); /* Reserved */
- //Allocate a new page
- dvbsub->p_page = trox_malloc (sizeof(dvbsub_page_t));
- dvbsub->p_page->i_timeout = i_timeout;
- // Number of regions:
- dvbsub->p_page->i_regions_number = (i_segment_length-2) / 6;
-
-/* Special workaround for CAVENA encoders
- * a page with no regions is sent instead of a 0x80 packet (End Of Display) */
- if( dvbsub->p_page->i_regions_number == 0 )
- {
- dvbsub_stop_display(p_spudec, dvbsub );
- }
-/* /Special workaround */
-
- dvbsub->p_page->regions =
- trox_malloc(dvbsub->p_page->i_regions_number*sizeof(dvbsub_region_t));
- for(k=0; k<dvbsub->p_page->i_regions_number ; k++)
- {
- dvbsub->p_page->regions[k].i_id = GetBits( &p_spudec->bit_stream, 8 );
- GetBits( &p_spudec->bit_stream, 8 ); /* Reserved */
- dvbsub->p_page->regions[k].i_x = GetBits( &p_spudec->bit_stream, 16 );
- dvbsub->p_page->regions[k].i_y = GetBits( &p_spudec->bit_stream, 16 );
- dvbsub->p_page->regions[k].p_object = NULL;
- }
-}
+ switch( i_type )
+ {
+ case DVBSUB_ST_PAGE_COMPOSITION:
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "decode_page_composition" );
+#endif
+ decode_page_composition( p_dec, s );
+ break;
+ case DVBSUB_ST_REGION_COMPOSITION:
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "decode_region_composition" );
+#endif
+ decode_region_composition( p_dec, s );
+ break;
-static void dvbsub_decode_region_composition (dvbsub_thread_t *p_spudec,
- dvbsub_all_t *dvbsub)
-{
- unsigned int i_segment_length;
- unsigned int i_processed_length;
- unsigned int i_region_id;
- dvbsub_region_t* p_region;
- unsigned int k;
- p_region = NULL;
- i_segment_length = GetBits( &p_spudec->bit_stream, 16 );
- // Get region id:
- i_region_id = GetBits( &p_spudec->bit_stream, 8 );
- for(k=0; k<dvbsub->p_page->i_regions_number; k++)
- {
- if ( dvbsub->p_page->regions[k].i_id == i_region_id )
- p_region = &(dvbsub->p_page->regions[k]);
- }
- if(p_region == NULL)
- {
- // TODO
- // The region has never been declared before
- // Internal error
- fprintf (stderr, "Decoding of undeclared region N/A...\n");
- return;
- }
- // Skip version number and fill flag
- if (ShowBits( &p_spudec->bit_stream, 4 ) == p_region->i_version_number)
- {
- fprintf(stderr, "Skipping already known region N/A ...\n");
- // TODO Skip the right number of bits
- }
- // Region attributes
- p_region->i_version_number = GetBits( &p_spudec->bit_stream, 4 );
- p_region->b_fill = GetBits( &p_spudec->bit_stream, 1 );
- GetBits( &p_spudec->bit_stream, 3 ); /* Reserved */
- p_region->i_width = GetBits( &p_spudec->bit_stream, 16 );
- p_region->i_height = GetBits( &p_spudec->bit_stream, 16 );
- p_region->i_level_comp = GetBits( &p_spudec->bit_stream, 3 );
- p_region->i_depth = GetBits( &p_spudec->bit_stream, 3 );
- GetBits( &p_spudec->bit_stream, 2 ); /* Reserved */
- p_region->i_clut = GetBits( &p_spudec->bit_stream, 8 );
- p_region->i_8bp_code = GetBits( &p_spudec->bit_stream, 8 );
- p_region->i_4bp_code = GetBits( &p_spudec->bit_stream, 4 );
- p_region->i_2bp_code = GetBits( &p_spudec->bit_stream, 2 );
- GetBits( &p_spudec->bit_stream, 2 ); /* Reserved */
- // List of objects in the region:
- // We already skipped 10 bytes
- i_processed_length = 10;
- while ( i_processed_length < i_segment_length )
- {
- // We create a new object
- dvbsub_objectdef_t* p_obj;
- p_obj = trox_malloc(sizeof(dvbsub_objectdef_t));
- // We parse object properties
- p_obj->i_id = GetBits( &p_spudec->bit_stream, 16 );
- p_obj->i_type = GetBits( &p_spudec->bit_stream, 2 );
- p_obj->i_provider = GetBits( &p_spudec->bit_stream, 2 );
- p_obj->i_xoffset = GetBits( &p_spudec->bit_stream, 12 );
- GetBits( &p_spudec->bit_stream, 4 ); /* Reserved */
- p_obj->i_yoffset = GetBits( &p_spudec->bit_stream, 12 );
- i_processed_length += 6;
- if ( p_obj->i_type == DVBSUB_OT_BASIC_CHAR
- || p_obj->i_type == DVBSUB_OT_COMPOSITE_STRING )
- {
- p_obj->i_fg_pc = GetBits( &p_spudec->bit_stream, 8 );
- p_obj->i_bg_pc = GetBits( &p_spudec->bit_stream, 8 );
- i_processed_length += 2;
- }
- p_obj->p_next = NULL;
- dvbsub_add_objectdef_to_region(p_obj, p_region);
+ case DVBSUB_ST_CLUT_DEFINITION:
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "decode_clut" );
+#endif
+ decode_clut( p_dec, s );
+ break;
+
+ case DVBSUB_ST_OBJECT_DATA:
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "decode_object" );
+#endif
+ decode_object( p_dec, s );
+ break;
+
+ case DVBSUB_ST_DISPLAY_DEFINITION:
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "decode_display_definition" );
+#endif
+ decode_display_definition( p_dec, s );
+ break;
+
+ case DVBSUB_ST_ENDOFDISPLAY:
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "end of display" );
+#endif
+ bs_skip( s, 8 * ( 2 + i_size ) );
+ break;
+
+ case DVBSUB_ST_STUFFING:
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "skip stuffing" );
+#endif
+ bs_skip( s, 8 * ( 2 + i_size ) );
+ break;
+
+ default:
+ msg_Warn( p_dec, "unsupported segment type: (%04x)", i_type );
+ bs_skip( s, 8 * ( 2 + i_size ) );
+ break;
}
}
-
-static void dvbsub_decode_object (dvbsub_thread_t* p_spudec,
- dvbsub_all_t* dvbsub)
+static void decode_clut( decoder_t *p_dec, bs_t *s )
{
- dvbsub_object_t* p_obj;
- dvbsub_object_t* p_o;
- uint16_t i_segment_length;
- uint16_t i_topfield_length;
- uint16_t i_bottomfield_length;
- // Memory Allocation
- p_obj = trox_malloc ( sizeof ( dvbsub_object_t ) );
- p_obj->p_next=NULL;
- i_segment_length = GetBits( &p_spudec->bit_stream, 16 );
- p_obj->i_id = GetBits( &p_spudec->bit_stream, 16 );
- p_obj->i_version_number = GetBits( &p_spudec->bit_stream, 4 );
- // TODO Check we don't already have this object / this version
- p_obj->i_coding_method = GetBits( &p_spudec->bit_stream, 2 );
- p_obj->b_non_modify_color = GetBits( &p_spudec->bit_stream, 1 );
- GetBits( &p_spudec->bit_stream, 1 ); /* Reserved */
- if(p_obj->i_coding_method == 0x00)
- {
- i_topfield_length = GetBits( &p_spudec->bit_stream, 16 );
- i_bottomfield_length = GetBits( &p_spudec->bit_stream, 16 );
- p_obj->topfield = dvbsub_parse_pdata (p_spudec, i_topfield_length);
- p_obj->bottomfield =
- dvbsub_parse_pdata (p_spudec, i_bottomfield_length);
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ uint16_t i_segment_length;
+ uint16_t i_processed_length;
+ dvbsub_clut_t *p_clut, *p_next;
+ int i_id, i_version;
+
+ i_segment_length = bs_read( s, 16 );
+ i_id = bs_read( s, 8 );
+ i_version = bs_read( s, 4 );
+
+ /* Check if we already have this clut */
+ for( p_clut = p_sys->p_cluts; p_clut != NULL; p_clut = p_clut->p_next )
+ {
+ if( p_clut->i_id == i_id ) break;
}
- else
+
+ /* Check version number */
+ if( p_clut && p_clut->i_version == i_version )
{
- GetBits(&p_spudec->bit_stream, (i_segment_length -3) *8);
- //TODO
- // DVB subtitling as characters
+ /* Nothing to do */
+ bs_skip( s, 8 * i_segment_length - 12 );
+ return;
}
- // Add this object to the list of the page
- p_o = dvbsub->p_objects;
- dvbsub->p_objects = p_obj;
- p_obj->p_next = p_o;
- return;
-}
-static void dvbsub_stop_display ( dvbsub_thread_t* p_dec,
- dvbsub_all_t* dvbsub)
-{
- unsigned int j;
+ if( !p_clut )
+ {
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "new clut: %i", i_id );
+#endif
+ p_clut = malloc( sizeof(dvbsub_clut_t) );
+ p_clut->p_next = p_sys->p_cluts;
+ p_sys->p_cluts = p_clut;
+ }
- for(j = 0; dvbsub->p_spu[j] != NULL; j++)
- dvbsub->p_spu[j]->i_stop = p_dec->bit_stream.p_pes->i_pts;
- return;
-}
+ /* Initialize to default clut */
+ p_next = p_clut->p_next;
+ *p_clut = p_sys->default_clut;
+ p_clut->p_next = p_next;
+
+ /* We don't have this version of the CLUT: Parse it */
+ p_clut->i_version = i_version;
+ p_clut->i_id = i_id;
+ bs_skip( s, 4 ); /* Reserved bits */
+ i_processed_length = 2;
+ while( i_processed_length < i_segment_length )
+ {
+ uint8_t y, cb, cr, t;
+ uint8_t i_id;
+ uint8_t i_type;
-static void dvbsub_decode_clut ( dvbsub_thread_t* p_dec,
- dvbsub_all_t* dvbsub)
-{
- uint16_t i_segment_length;
- uint16_t i_processed_length;
- uint8_t i_entry_id;
- uint8_t i_entry_type;
- dvbsub_clut_t* clut;
- uint8_t i_clut_id;
- uint8_t i_version_number;
- uint8_t y;
- uint8_t cr;
- uint8_t cb;
- uint8_t t;
- i_segment_length = GetBits( &p_dec->bit_stream, 16 );
- i_clut_id = GetBits( &p_dec->bit_stream, 8 );
- i_version_number = GetBits( &p_dec->bit_stream, 4 );
- // Check that this id doesn't not already exist
- // with the same version number
- // And allocate memory if necessary
- if( dvbsub->p_clut[i_clut_id] != NULL)
- {
- if ( dvbsub->p_clut[i_clut_id]->i_version_number == i_version_number )
+ i_id = bs_read( s, 8 );
+ i_type = bs_read( s, 3 );
+
+ bs_skip( s, 4 );
+
+ if( bs_read( s, 1 ) )
{
- //TODO skip the right number of bits
- return;
+ y = bs_read( s, 8 );
+ cr = bs_read( s, 8 );
+ cb = bs_read( s, 8 );
+ t = bs_read( s, 8 );
+ i_processed_length += 6;
}
else
{
- memset(dvbsub->p_clut[i_clut_id], 0, sizeof(dvbsub_clut_t));
+ y = bs_read( s, 6 ) << 2;
+ cr = bs_read( s, 4 ) << 4;
+ cb = bs_read( s, 4 ) << 4;
+ t = bs_read( s, 2 ) << 6;
+ i_processed_length += 4;
}
- }
- else
- {
- dvbsub->p_clut[i_clut_id] = trox_malloc(sizeof(dvbsub_clut_t));
- }
- clut = dvbsub->p_clut[i_clut_id];
- /* We don't have this version of the CLUT:
- * Parse it */
- clut->i_version_number = i_version_number;
- GetBits( &p_dec->bit_stream, 4 ); /* Reserved bits */
- i_processed_length=2;
- while(i_processed_length<i_segment_length)
- {
- i_entry_id = GetBits( &p_dec->bit_stream, 8 );
- i_entry_type = GetBits( &p_dec->bit_stream, 3 );
- GetBits( &p_dec->bit_stream, 4 );
- if ( GetBits( &p_dec->bit_stream, 1 )==0x01 )
+
+ /* We are not entirely compliant here as full transparency is indicated
+ * with a luma value of zero, not a transparency value of 0xff
+ * (full transparency would actually be 0xff + 1). */
+ if( y == 0 )
{
- y = GetBits( &p_dec->bit_stream, 8 );
- cr = GetBits( &p_dec->bit_stream, 8 );
- cb = GetBits( &p_dec->bit_stream, 8 );
- t = GetBits( &p_dec->bit_stream, 8 );
- i_processed_length += 6;
+ cr = cb = 0;
+ t = 0xff;
}
- else
+
+ /* According to EN 300-743 section 7.2.3 note 1, type should
+ * not have more than 1 bit set to one, but some streams don't
+ * respect this note. */
+ if( i_type & 0x04 && i_id < 4 )
+ {
+ p_clut->c_2b[i_id].Y = y;
+ p_clut->c_2b[i_id].Cr = cr;
+ p_clut->c_2b[i_id].Cb = cb;
+ p_clut->c_2b[i_id].T = t;
+ }
+ if( i_type & 0x02 && i_id < 16 )
{
- y = GetBits( &p_dec->bit_stream, 6 );
- cr = GetBits( &p_dec->bit_stream, 4 );
- cb = GetBits( &p_dec->bit_stream, 4 );
- t = GetBits( &p_dec->bit_stream, 2 );
- i_processed_length += 4;
+ p_clut->c_4b[i_id].Y = y;
+ p_clut->c_4b[i_id].Cr = cr;
+ p_clut->c_4b[i_id].Cb = cb;
+ p_clut->c_4b[i_id].T = t;
+ }
+ if( i_type & 0x01 )
+ {
+ p_clut->c_8b[i_id].Y = y;
+ p_clut->c_8b[i_id].Cr = cr;
+ p_clut->c_8b[i_id].Cb = cb;
+ p_clut->c_8b[i_id].T = t;
}
- dvbsub_clut_add_entry(clut, i_entry_type, i_entry_id, y, cr, cb, t);
}
}
-
-static void dvbsub_clut_add_entry ( dvbsub_clut_t* clut, uint8_t type,
- uint8_t id, uint8_t y, uint8_t cr,
- uint8_t cb, uint8_t t)
+static void decode_page_composition( decoder_t *p_dec, bs_t *s )
{
- /* According to EN 300-743 section 7.2.3 note 1, type should
- * not have more than 1 bit set to one
- But, some strams don't respect this note. */
- if( type & 0x04)
- {
- clut->c_2b[id].Y = y;
- clut->c_2b[id].Cr = cr;
- clut->c_2b[id].Cb = cb;
- clut->c_2b[id].T = t;
- }
- if( type & 0x02)
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ int i_version, i_state, i_segment_length, i_timeout, i;
+
+ /* A page is composed by 0 or more region */
+ i_segment_length = bs_read( s, 16 );
+ i_timeout = bs_read( s, 8 );
+ i_version = bs_read( s, 4 );
+ i_state = bs_read( s, 2 );
+ bs_skip( s, 2 ); /* Reserved */
+
+ if( i_state == DVBSUB_PCS_STATE_CHANGE )
{
- clut->c_4b[id].Y = y;
- clut->c_4b[id].Cr = cr;
- clut->c_4b[id].Cb = cb;
- clut->c_4b[id].T = t;
+ /* End of an epoch, reset decoder buffer */
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "page composition mode change" );
+#endif
+ free_all( p_dec );
}
- if( type & 0x01)
+ else if( !p_sys->p_page && i_state != DVBSUB_PCS_STATE_ACQUISITION &&
+ i_state != DVBSUB_PCS_STATE_CHANGE )
{
- clut->c_8b[id].Y = y;
- clut->c_8b[id].Cr = cr;
- clut->c_8b[id].Cb = cb;
- clut->c_8b[id].T = t;
+ /* Not a full PCS, we need to wait for one */
+ msg_Dbg( p_dec, "didn't receive an acquisition page yet" );
+
+#if 0
+ /* Try to start decoding even without an acquisition page */
+ bs_skip( s, 8 * (i_segment_length - 2) );
+ return;
+#endif
}
- return;
-}
+#ifdef DEBUG_DVBSUB
+ if( i_state == DVBSUB_PCS_STATE_ACQUISITION )
+ msg_Dbg( p_dec, "acquisition page composition" );
+#endif
-static void dvbsub_add_objectdef_to_region ( dvbsub_objectdef_t* p_obj,
- dvbsub_region_t* p_region )
-{
- dvbsub_objectdef_t* p_o = p_region->p_object;
- // Seek to the last non null element
- if(p_o!=NULL)
+ /* Check version number */
+ if( p_sys->p_page && p_sys->p_page->i_version == i_version )
{
- for(; p_o->p_next!=NULL; p_o=p_o->p_next);
- p_o->p_next = p_obj;
- p_o->p_next->p_next = NULL;
+ bs_skip( s, 8 * (i_segment_length - 2) );
+ return;
}
- else
+ else if( p_sys->p_page )
{
- p_region->p_object = p_obj;
- p_region->p_object->p_next = NULL;
+ if( p_sys->p_page->i_region_defs )
+ free( p_sys->p_page->p_region_defs );
+ p_sys->p_page->i_region_defs = 0;
}
- return;
-}
-
-static dvbsub_image_t* dvbsub_parse_pdata ( dvbsub_thread_t* p_spudec,
- uint16_t length )
-{
- dvbsub_image_t* p_image;
- uint16_t i_processed_length=0;
- uint16_t i_lines=0;
- uint16_t i_cols_last=0;
- p_image = trox_malloc ( sizeof ( dvbsub_image_t) );
- p_image->p_last=NULL;
- memset(p_image->i_cols, 0, 576*sizeof(uint16_t));
- /* Let's parse it a first time to determine the size of the buffer */
- while (i_processed_length < length)
- {
- switch(GetBits( &p_spudec->bit_stream, 8 ))
- {
- case 0x10:
- fprintf(stderr, "0x10 N/A\n");
- break;
- case 0x11:
- i_processed_length += 1 + dvbsub_count0x11(p_spudec,
- &(p_image->i_cols[i_lines]),
- p_image);
- break;
- case 0x12:
- fprintf(stderr, "0x12 N/A\n");
- break;
- case 0x20:
- fprintf(stderr, "0x20 N/A\n");
- break;
- case 0x21:
- fprintf(stderr, "0x21 N/A\n");
- break;
- case 0x22:
- fprintf(stderr, "0x22 N/A\n");
- break;
- case 0xf0:
- i_processed_length++;
- i_lines++;
- break;
- }
+ if( !p_sys->p_page )
+ {
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "new page" );
+#endif
+ /* Allocate a new page */
+ p_sys->p_page = malloc( sizeof(dvbsub_page_t) );
}
- p_image->i_rows = i_lines;
- p_image->i_cols[i_lines] = i_cols_last;
- // Check word-aligned bits
- if(ShowBits( &p_spudec->bit_stream, 8 )==0x00)
- GetBits( &p_spudec->bit_stream, 8 );
- return p_image;
-}
+ p_sys->p_page->i_version = i_version;
+ p_sys->p_page->i_timeout = i_timeout;
+ p_sys->b_page = VLC_TRUE;
+ /* Number of regions */
+ p_sys->p_page->i_region_defs = (i_segment_length - 2) / 6;
-static void add_rle_code (dvbsub_image_t* p, uint16_t num, uint8_t color)
-{
- if(p->p_last != NULL)
- {
- p->p_last->p_next = trox_malloc (sizeof (dvbsub_rle_t));
- p->p_last = p->p_last->p_next;
- }
- else
+ if( p_sys->p_page->i_region_defs == 0 ) return;
+
+ p_sys->p_page->p_region_defs =
+ malloc( p_sys->p_page->i_region_defs * sizeof(dvbsub_region_t) );
+ for( i = 0; i < p_sys->p_page->i_region_defs; i++ )
{
- p->p_codes = trox_malloc (sizeof (dvbsub_rle_t));
- p->p_last = p->p_codes;
+ p_sys->p_page->p_region_defs[i].i_id = bs_read( s, 8 );
+ bs_skip( s, 8 ); /* Reserved */
+ p_sys->p_page->p_region_defs[i].i_x = bs_read( s, 16 );
+ p_sys->p_page->p_region_defs[i].i_y = bs_read( s, 16 );
+
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "page_composition, region %i (%i,%i)",
+ i, p_sys->p_page->p_region_defs[i].i_x,
+ p_sys->p_page->p_region_defs[i].i_y );
+#endif
}
- p->p_last->i_num = num;
- p->p_last->i_color_code = color;
- p->p_last->p_next = NULL;
- return;
}
-
-static uint16_t dvbsub_count0x11(dvbsub_thread_t* p_spudec, uint16_t* p, dvbsub_image_t* p_image)
+static void decode_region_composition( decoder_t *p_dec, bs_t *s )
{
- uint16_t i_processed=0;
- vlc_bool_t b_stop=0;
- uint16_t i_count = 0;
- uint8_t i_color =0;
- while (!b_stop)
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ dvbsub_region_t *p_region, **pp_region = &p_sys->p_regions;
+ int i_segment_length, i_processed_length, i_id, i_version;
+ int i_width, i_height, i_level_comp, i_depth, i_clut;
+ int i_8_bg, i_4_bg, i_2_bg;
+ vlc_bool_t b_fill;
+
+ i_segment_length = bs_read( s, 16 );
+ i_id = bs_read( s, 8 );
+ i_version = bs_read( s, 4 );
+
+ /* Check if we already have this region */
+ for( p_region = p_sys->p_regions; p_region != NULL;
+ p_region = p_region->p_next )
{
- if ( (i_color = GetBits( &p_spudec->bit_stream, 4 )) != 0x00 )
- {
- (*p)++;
- i_processed+=4;
- // 1 pixel of color code '0000'
- add_rle_code (p_image, 1, i_color );
- }
+ pp_region = &p_region->p_next;
+ if( p_region->i_id == i_id ) break;
+ }
+
+ /* Check version number */
+ if( p_region && p_region->i_version == i_version )
+ {
+ bs_skip( s, 8 * (i_segment_length - 1) - 4 );
+ return;
+ }
+
+ if( !p_region )
+ {
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "new region: %i", i_id );
+#endif
+ p_region = *pp_region = malloc( sizeof(dvbsub_region_t) );
+ memset( p_region, 0, sizeof(dvbsub_region_t) );
+ p_region->p_object_defs = NULL;
+ p_region->p_pixbuf = NULL;
+ p_region->p_next = NULL;
+ }
+
+ /* Region attributes */
+ p_region->i_id = i_id;
+ p_region->i_version = i_version;
+ b_fill = bs_read( s, 1 );
+ bs_skip( s, 3 ); /* Reserved */
+
+ i_width = bs_read( s, 16 );
+ i_height = bs_read( s, 16 );
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, " width=%d height=%d", i_width, i_height );
+#endif
+ i_level_comp = bs_read( s, 3 );
+ i_depth = bs_read( s, 3 );
+ bs_skip( s, 2 ); /* Reserved */
+ i_clut = bs_read( s, 8 );
+
+ i_8_bg = bs_read( s, 8 );
+ i_4_bg = bs_read( s, 4 );
+ i_2_bg = bs_read( s, 2 );
+ bs_skip( s, 2 ); /* Reserved */
+
+ /* Free old object defs */
+ while( p_region->i_object_defs )
+ {
+ int i = p_region->i_object_defs - 1;
+ if( p_region->p_object_defs[i].psz_text )
+ free( p_region->p_object_defs[i].psz_text );
+ if( !i ) free( p_region->p_object_defs );
+
+ p_region->i_object_defs--;
+ }
+ p_region->p_object_defs = NULL;
+
+ /* Extra sanity checks */
+ if( p_region->i_width != i_width || p_region->i_height != i_height )
+ {
+ if( p_region->p_pixbuf )
+ {
+ msg_Dbg( p_dec, "region size changed (%dx%d->%dx%d)",
+ p_region->i_width, p_region->i_height, i_width, i_height );
+ free( p_region->p_pixbuf );
+ }
+
+ p_region->p_pixbuf = malloc( i_height * i_width );
+ p_region->i_depth = 0;
+ b_fill = VLC_TRUE;
+ }
+ if( p_region->i_depth && (p_region->i_depth != i_depth ||
+ p_region->i_level_comp != i_level_comp || p_region->i_clut != i_clut) )
+ {
+ msg_Dbg( p_dec, "region parameters changed (not allowed)" );
+ }
+
+ /* Erase background of region */
+ if( b_fill )
+ {
+ int i_background = (p_region->i_depth == 1) ? i_2_bg :
+ (p_region->i_depth == 2) ? i_4_bg : i_8_bg;
+ memset( p_region->p_pixbuf, i_background, i_width * i_height );
+ }
+
+ p_region->i_width = i_width;
+ p_region->i_height = i_height;
+ p_region->i_level_comp = i_level_comp;
+ p_region->i_depth = i_depth;
+ p_region->i_clut = i_clut;
+
+ /* List of objects in the region */
+ i_processed_length = 10;
+ while( i_processed_length < i_segment_length )
+ {
+ dvbsub_objectdef_t *p_obj;
+
+ /* We create a new object */
+ p_region->i_object_defs++;
+ p_region->p_object_defs =
+ realloc( p_region->p_object_defs,
+ sizeof(dvbsub_objectdef_t) * p_region->i_object_defs );
+
+ /* We parse object properties */
+ p_obj = &p_region->p_object_defs[p_region->i_object_defs - 1];
+ p_obj->i_id = bs_read( s, 16 );
+ p_obj->i_type = bs_read( s, 2 );
+ bs_skip( s, 2 ); /* Provider */
+ p_obj->i_x = bs_read( s, 12 );
+ bs_skip( s, 4 ); /* Reserved */
+ p_obj->i_y = bs_read( s, 12 );
+ p_obj->psz_text = 0;
+
+ i_processed_length += 6;
+
+ if( p_obj->i_type == DVBSUB_OT_BASIC_CHAR ||
+ p_obj->i_type == DVBSUB_OT_COMPOSITE_STRING )
+ {
+ p_obj->i_fg_pc = bs_read( s, 8 );
+ p_obj->i_bg_pc = bs_read( s, 8 );
+ i_processed_length += 2;
+ }
+ }
+}
+
+/* ETSI 300 743 [7.2.1] */
+static void decode_display_definition( decoder_t *p_dec, bs_t *s )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ uint16_t i_segment_length;
+ uint16_t i_processed_length = 40;
+ dvbsub_display_t *p_display;
+ dvbsub_display_t *p_old = p_sys->p_display;
+ int i_version;
+
+ i_segment_length = bs_read( s, 16 );
+ i_version = bs_read( s, 4 );
+
+ /* Check version number */
+ if( p_old && p_old->i_version == i_version )
+ {
+ /* The definition did not change */
+ bs_skip( s, 8*i_segment_length - 4 );
+ return;
+ }
+
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "new display definition: %i", i_version );
+#endif
+ p_display = malloc( sizeof(dvbsub_display_t) );
+
+ /* We don't have this version of the display definition: Parse it */
+ p_display->i_version = i_version;
+ p_display->b_windowed = bs_read( s, 1 );
+ bs_skip( s, 3 ); /* Reserved bits */
+ p_display->i_width = bs_read( s, 16 )+1;
+ p_display->i_height = bs_read( s, 16 )+1;
+
+ if( p_display->b_windowed )
+ {
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "display definition with offsets (windowed)" );
+#endif
+ /* Coordinates are measured from the top left corner */
+ p_display->i_x = bs_read( s, 16 );
+ p_display->i_max_x = bs_read( s, 16 );
+ p_display->i_y = bs_read( s, 16 );
+ p_display->i_max_y = bs_read( s, 16 );
+ i_processed_length += 64;
+ }
+
+ p_sys->p_display = p_display;
+ if( p_old ) free( p_old );
+
+ if( i_processed_length != i_segment_length*8 )
+ {
+ msg_Err( p_dec, "processed length %d != segment length %d", i_processed_length, i_segment_length );
+ }
+
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "version: %d, width: %d, height: %d", p_display->i_version, p_display->i_width, p_display->i_height );
+ if( p_display->b_windowed )
+ msg_Dbg( p_dec, "xmin: %d, xmax: %d, ymin: %d, ymax: %d", p_display->i_x, p_display->i_max_x, p_display->i_y, p_display->i_max_y );
+#endif
+}
+
+static void dvbsub_render_pdata( decoder_t *, dvbsub_region_t *, int, int,
+ uint8_t *, int );
+static void dvbsub_pdata2bpp( bs_t *, uint8_t *, int, int * );
+static void dvbsub_pdata4bpp( bs_t *, uint8_t *, int, int * );
+static void dvbsub_pdata8bpp( bs_t *, uint8_t *, int, int * );
+
+static void decode_object( decoder_t *p_dec, bs_t *s )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ dvbsub_region_t *p_region;
+ int i_segment_length, i_coding_method, i_version, i_id, i;
+ vlc_bool_t b_non_modify_color;
+
+ /* ETSI 300-743 paragraph 7.2.4
+ * sync_byte, segment_type and page_id have already been processed.
+ */
+ i_segment_length = bs_read( s, 16 );
+ i_id = bs_read( s, 16 );
+ i_version = bs_read( s, 4 );
+ i_coding_method = bs_read( s, 2 );
+
+ if( i_coding_method > 1 )
+ {
+ msg_Dbg( p_dec, "unknown DVB subtitling coding %d is not handled!", i_coding_method );
+ bs_skip( s, 8 * (i_segment_length - 2) - 6 );
+ return;
+ }
+
+ /* Check if the object needs to be rendered in at least one
+ * of the regions */
+ for( p_region = p_sys->p_regions; p_region != NULL;
+ p_region = p_region->p_next )
+ {
+ for( i = 0; i < p_region->i_object_defs; i++ )
+ if( p_region->p_object_defs[i].i_id == i_id ) break;
+
+ if( i != p_region->i_object_defs ) break;
+ }
+ if( !p_region )
+ {
+ bs_skip( s, 8 * (i_segment_length - 2) - 6 );
+ return;
+ }
+
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "new object: %i", i_id );
+#endif
+
+ b_non_modify_color = bs_read( s, 1 );
+ bs_skip( s, 1 ); /* Reserved */
+
+ if( i_coding_method == 0x00 )
+ {
+ int i_topfield, i_bottomfield;
+ uint8_t *p_topfield, *p_bottomfield;
+
+ i_topfield = bs_read( s, 16 );
+ i_bottomfield = bs_read( s, 16 );
+ p_topfield = s->p_start + bs_pos( s ) / 8;
+ p_bottomfield = p_topfield + i_topfield;
+
+ bs_skip( s, 8 * (i_segment_length - 7) );
+
+ /* Sanity check */
+ if( i_segment_length < i_topfield + i_bottomfield + 7 ||
+ p_topfield + i_topfield + i_bottomfield > s->p_end )
+ {
+ msg_Dbg( p_dec, "corrupted object data" );
+ return;
+ }
+
+ for( p_region = p_sys->p_regions; p_region != NULL;
+ p_region = p_region->p_next )
+ {
+ for( i = 0; i < p_region->i_object_defs; i++ )
+ {
+ if( p_region->p_object_defs[i].i_id != i_id ) continue;
+
+ dvbsub_render_pdata( p_dec, p_region,
+ p_region->p_object_defs[i].i_x,
+ p_region->p_object_defs[i].i_y,
+ p_topfield, i_topfield );
+
+ if( i_bottomfield )
+ {
+ dvbsub_render_pdata( p_dec, p_region,
+ p_region->p_object_defs[i].i_x,
+ p_region->p_object_defs[i].i_y + 1,
+ p_bottomfield, i_bottomfield );
+ }
+ else
+ {
+ /* Duplicate the top field */
+ dvbsub_render_pdata( p_dec, p_region,
+ p_region->p_object_defs[i].i_x,
+ p_region->p_object_defs[i].i_y + 1,
+ p_topfield, i_topfield );
+ }
+ }
+ }
+ }
+ else
+ {
+ /* DVB subtitling as characters */
+ int i_number_of_codes = bs_read( s, 8 );
+ uint8_t* p_start = s->p_start + bs_pos( s ) / 8;
+
+ /* Sanity check */
+ if( i_segment_length < i_number_of_codes*2 + 4 ||
+ p_start + i_number_of_codes*2 > s->p_end )
+ {
+ msg_Dbg( p_dec, "corrupted object data" );
+ return;
+ }
+
+ for( p_region = p_sys->p_regions; p_region != NULL;
+ p_region = p_region->p_next )
+ {
+ for( i = 0; i < p_region->i_object_defs; i++ )
+ {
+ int j;
+
+ if( p_region->p_object_defs[i].i_id != i_id ) continue;
+
+ p_region->p_object_defs[i].psz_text =
+ realloc( p_region->p_object_defs[i].psz_text,
+ i_number_of_codes + 1 );
+
+ /* FIXME 16bits -> char ??? See Preamble */
+ for( j = 0; j < i_number_of_codes; j++ )
+ {
+ p_region->p_object_defs[i].psz_text[j] = (char)(bs_read( s, 16 ) & 0xFF);
+ }
+ p_region->p_object_defs[i].psz_text[j] = 0;
+ }
+ }
+ }
+
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "end object: %i", i_id );
+#endif
+}
+
+static void dvbsub_render_pdata( decoder_t *p_dec, dvbsub_region_t *p_region,
+ int i_x, int i_y,
+ uint8_t *p_field, int i_field )
+{
+ uint8_t *p_pixbuf;
+ int i_offset = 0;
+ bs_t bs;
+
+ /* Sanity check */
+ if( !p_region->p_pixbuf )
+ {
+ msg_Err( p_dec, "region %i has no pixel buffer!", p_region->i_id );
+ return;
+ }
+ if( i_y < 0 || i_x < 0 || i_y >= p_region->i_height ||
+ i_x >= p_region->i_width )
+ {
+ msg_Dbg( p_dec, "invalid offset (%i,%i)", i_x, i_y );
+ return;
+ }
+
+ p_pixbuf = p_region->p_pixbuf + i_y * p_region->i_width;
+ bs_init( &bs, p_field, i_field );
+
+ while( !bs_eof( &bs ) )
+ {
+ /* Sanity check */
+ if( i_y >= p_region->i_height ) return;
+
+ switch( bs_read( &bs, 8 ) )
+ {
+ case 0x10:
+ dvbsub_pdata2bpp( &bs, p_pixbuf + i_x, p_region->i_width - i_x,
+ &i_offset );
+ break;
+
+ case 0x11:
+ dvbsub_pdata4bpp( &bs, p_pixbuf + i_x, p_region->i_width - i_x,
+ &i_offset );
+ break;
+
+ case 0x12:
+ dvbsub_pdata8bpp( &bs, p_pixbuf + i_x, p_region->i_width - i_x,
+ &i_offset );
+ break;
+
+ case 0x20:
+ case 0x21:
+ case 0x22:
+ /* We don't use map tables */
+ break;
+
+ case 0xf0: /* End of line code */
+ p_pixbuf += 2*p_region->i_width;
+ i_offset = 0; i_y += 2;
+ break;
+ }
+ }
+}
+
+static void dvbsub_pdata2bpp( bs_t *s, uint8_t *p, int i_width, int *pi_off )
+{
+ vlc_bool_t b_stop = 0;
+
+ while( !b_stop && !bs_eof( s ) )
+ {
+ int i_count = 0, i_color = 0;
+
+ if( (i_color = bs_read( s, 2 )) != 0x00 )
+ {
+ i_count = 1;
+ }
+ else
+ {
+ if( bs_read( s, 1 ) == 0x01 ) // Switch1
+ {
+ i_count = 3 + bs_read( s, 3 );
+ i_color = bs_read( s, 2 );
+ }
+ else
+ {
+ if( bs_read( s, 1 ) == 0x00 ) //Switch2
+ {
+ switch( bs_read( s, 2 ) ) //Switch3
+ {
+ case 0x00:
+ b_stop = 1;
+ break;
+ case 0x01:
+ i_count = 2;
+ break;
+ case 0x02:
+ i_count = 12 + bs_read( s, 4 );
+ i_color = bs_read( s, 2 );
+ break;
+ case 0x03:
+ i_count = 29 + bs_read( s, 8 );
+ i_color = bs_read( s, 2 );
+ break;
+ default:
+ break;
+ }
+ }
+ else
+ {
+ /* 1 pixel color 0 */
+ i_count = 1;
+ }
+ }
+ }
+
+ if( !i_count ) continue;
+
+ /* Sanity check */
+ if( i_count + *pi_off > i_width ) break;
+
+ if( i_count == 1 ) p[*pi_off] = i_color;
+ else memset( p + *pi_off, i_color, i_count );
+
+ (*pi_off) += i_count;
+ }
+
+ bs_align( s );
+}
+
+static void dvbsub_pdata4bpp( bs_t *s, uint8_t *p, int i_width, int *pi_off )
+{
+ vlc_bool_t b_stop = 0;
+
+ while( !b_stop && !bs_eof( s ) )
+ {
+ int i_count = 0, i_color = 0;
+
+ if( (i_color = bs_read( s, 4 )) != 0x00 )
+ {
+ /* Add 1 pixel */
+ i_count = 1;
+ }
+ else
+ {
+ if( bs_read( s, 1 ) == 0x00 ) // Switch1
+ {
+ if( bs_show( s, 3 ) != 0x00 )
+ {
+ i_count = 2 + bs_read( s, 3 );
+ }
+ else
+ {
+ bs_skip( s, 3 );
+ b_stop = 1;
+ }
+ }
+ else
+ {
+ if( bs_read( s, 1 ) == 0x00) //Switch2
+ {
+ i_count = 4 + bs_read( s, 2 );
+ i_color = bs_read( s, 4 );
+ }
+ else
+ {
+ switch ( bs_read( s, 2 ) ) //Switch3
+ {
+ case 0x0:
+ i_count = 1;
+ break;
+ case 0x1:
+ i_count = 2;
+ break;
+ case 0x2:
+ i_count = 9 + bs_read( s, 4 );
+ i_color = bs_read( s, 4 );
+ break;
+ case 0x3:
+ i_count= 25 + bs_read( s, 8 );
+ i_color = bs_read( s, 4 );
+ break;
+ }
+ }
+ }
+ }
+
+ if( !i_count ) continue;
+
+ /* Sanity check */
+ if( i_count + *pi_off > i_width ) break;
+
+ if( i_count == 1 ) p[*pi_off] = i_color;
+ else memset( p + *pi_off, i_color, i_count );
+
+ (*pi_off) += i_count;
+ }
+
+ bs_align( s );
+}
+
+static void dvbsub_pdata8bpp( bs_t *s, uint8_t *p, int i_width, int *pi_off )
+{
+ vlc_bool_t b_stop = 0;
+
+ while( !b_stop && !bs_eof( s ) )
+ {
+ int i_count = 0, i_color = 0;
+
+ if( (i_color = bs_read( s, 8 )) != 0x00 )
+ {
+ /* Add 1 pixel */
+ i_count = 1;
+ }
else
{
- if(GetBits( &p_spudec->bit_stream, 1 ) == 0x00) // Switch1
+ if( bs_read( s, 1 ) == 0x00 ) // Switch1
+ {
+ if( bs_show( s, 7 ) != 0x00 )
+ {
+ i_count = bs_read( s, 7 );
+ }
+ else
+ {
+ bs_skip( s, 7 );
+ b_stop = 1;
+ }
+ }
+ else
+ {
+ i_count = bs_read( s, 7 );
+ i_color = bs_read( s, 8 );
+ }
+ }
+
+ if( !i_count ) continue;
+
+ /* Sanity check */
+ if( i_count + *pi_off > i_width ) break;
+
+ if( i_count == 1 ) p[*pi_off] = i_color;
+ else memset( p + *pi_off, i_color, i_count );
+
+ (*pi_off) += i_count;
+ }
+
+ bs_align( s );
+}
+
+static void free_all( decoder_t *p_dec )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ dvbsub_region_t *p_reg, *p_reg_next;
+ dvbsub_clut_t *p_clut, *p_clut_next;
+
+ if( p_sys->p_display ) free( p_sys->p_display );
+
+ for( p_clut = p_sys->p_cluts; p_clut != NULL; p_clut = p_clut_next )
+ {
+ p_clut_next = p_clut->p_next;
+ free( p_clut );
+ }
+ p_sys->p_cluts = NULL;
+
+ for( p_reg = p_sys->p_regions; p_reg != NULL; p_reg = p_reg_next )
+ {
+ int i;
+
+ p_reg_next = p_reg->p_next;
+ for( i = 0; i < p_reg->i_object_defs; i++ )
+ if( p_reg->p_object_defs[i].psz_text )
+ free( p_reg->p_object_defs[i].psz_text );
+ if( p_reg->i_object_defs ) free( p_reg->p_object_defs );
+ if( p_reg->p_pixbuf ) free( p_reg->p_pixbuf );
+ free( p_reg );
+ }
+ p_sys->p_regions = NULL;
+
+ if( p_sys->p_page )
+ {
+ if( p_sys->p_page->i_region_defs )
+ free( p_sys->p_page->p_region_defs );
+ free( p_sys->p_page );
+ }
+ p_sys->p_page = NULL;
+}
+
+static subpicture_t *render( decoder_t *p_dec )
+{
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ subpicture_t *p_spu;
+ subpicture_region_t **pp_spu_region;
+ int i, j, i_timeout = 0;
+
+ /* Allocate the subpicture internal data. */
+ p_spu = p_dec->pf_spu_buffer_new( p_dec );
+ if( !p_spu ) return NULL;
+
+ pp_spu_region = &p_spu->p_region;
+
+ /* Loop on region definitions */
+#ifdef DEBUG_DVBSUB
+ if( p_sys->p_page )
+ msg_Dbg( p_dec, "rendering %i regions", p_sys->p_page->i_region_defs );
+#endif
+
+ for( i = 0; p_sys->p_page && i < p_sys->p_page->i_region_defs; i++ )
+ {
+ dvbsub_region_t *p_region;
+ dvbsub_regiondef_t *p_regiondef;
+ dvbsub_clut_t *p_clut;
+ dvbsub_color_t *p_color;
+ subpicture_region_t *p_spu_region;
+ uint8_t *p_src, *p_dst;
+ video_format_t fmt;
+ int i_pitch;
+
+ i_timeout = p_sys->p_page->i_timeout;
+
+ p_regiondef = &p_sys->p_page->p_region_defs[i];
+
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_dec, "rendering region %i (%i,%i)", i,
+ p_regiondef->i_x, p_regiondef->i_y );
+#endif
+
+ /* Find associated region */
+ for( p_region = p_sys->p_regions; p_region != NULL;
+ p_region = p_region->p_next )
+ {
+ if( p_regiondef->i_id == p_region->i_id ) break;
+ }
+
+ if( !p_region )
+ {
+ msg_Dbg( p_dec, "region %i not found", p_regiondef->i_id );
+ continue;
+ }
+
+ /* Find associated CLUT */
+ for( p_clut = p_sys->p_cluts; p_clut != NULL; p_clut = p_clut->p_next )
+ {
+ if( p_region->i_clut == p_clut->i_id ) break;
+ }
+ if( !p_clut )
+ {
+ msg_Dbg( p_dec, "clut %i not found", p_region->i_clut );
+ continue;
+ }
+
+ /* Create new SPU 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_region->i_width;
+ fmt.i_height = fmt.i_visible_height = p_region->i_height;
+ fmt.i_x_offset = fmt.i_y_offset = 0;
+ p_spu_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt );
+ if( !p_spu_region )
+ {
+ msg_Err( p_dec, "cannot allocate SPU region" );
+ continue;
+ }
+ p_spu_region->i_x = p_regiondef->i_x;
+ p_spu_region->i_y = p_regiondef->i_y;
+ p_spu_region->i_align = p_sys->i_spu_position;
+ *pp_spu_region = p_spu_region;
+ pp_spu_region = &p_spu_region->p_next;
+
+ /* Build palette */
+ fmt.p_palette->i_entries = p_region->i_depth == 1 ? 4 :
+ p_region->i_depth == 2 ? 16 : 256;
+ p_color = (p_region->i_depth == 1) ? p_clut->c_2b :
+ (p_region->i_depth == 2) ? p_clut->c_4b : p_clut->c_8b;
+ for( j = 0; j < fmt.p_palette->i_entries; j++ )
+ {
+ fmt.p_palette->palette[j][0] = p_color[j].Y;
+ fmt.p_palette->palette[j][1] = p_color[j].Cb; /* U == Cb */
+ fmt.p_palette->palette[j][2] = p_color[j].Cr; /* V == Cr */
+ fmt.p_palette->palette[j][3] = 0xff - p_color[j].T;
+ }
+
+ p_src = p_region->p_pixbuf;
+ p_dst = p_spu_region->picture.Y_PIXELS;
+ i_pitch = p_spu_region->picture.Y_PITCH;
+
+ /* Copy pixel buffer */
+ for( j = 0; j < p_region->i_height; j++ )
+ {
+ memcpy( p_dst, p_src, p_region->i_width );
+ p_src += p_region->i_width;
+ p_dst += i_pitch;
+ }
+
+ /* Check subtitles encoded as strings of characters
+ * (since there are not rendered in the pixbuffer) */
+ for( j = 0; j < p_region->i_object_defs; j++ )
+ {
+ dvbsub_objectdef_t *p_object_def = &p_region->p_object_defs[j];
+
+ if( p_object_def->i_type != 1 || !p_object_def->psz_text )
+ continue;
+
+ /* Create new SPU region */
+ memset( &fmt, 0, sizeof(video_format_t) );
+ fmt.i_chroma = VLC_FOURCC('T','E','X','T');
+ fmt.i_aspect = VOUT_ASPECT_FACTOR;
+ fmt.i_width = fmt.i_visible_width = p_region->i_width;
+ fmt.i_height = fmt.i_visible_height = p_region->i_height;
+ fmt.i_x_offset = fmt.i_y_offset = 0;
+ p_spu_region = p_spu->pf_create_region( VLC_OBJECT(p_dec), &fmt );
+ if( !p_region )
+ {
+ msg_Err( p_dec, "cannot allocate SPU region" );
+ continue;
+ }
+
+ p_spu_region->psz_text = strdup( p_object_def->psz_text );
+ p_spu_region->i_x = p_regiondef->i_x + p_object_def->i_x;
+ p_spu_region->i_y = p_regiondef->i_y + p_object_def->i_y;
+ p_spu_region->i_align = p_sys->i_spu_position;
+ *pp_spu_region = p_spu_region;
+ pp_spu_region = &p_spu_region->p_next;
+ }
+ }
+
+ /* Set the pf_render callback */
+ p_spu->i_start = p_sys->i_pts;
+ p_spu->b_ephemer = VLC_TRUE;
+ p_spu->b_pausable = VLC_TRUE;
+ //p_spu->b_fade = VLC_TRUE;
+ //p_spu->i_stop = p_spu->i_start + (mtime_t) (i_timeout * 1000000);
+
+ /* Correct positioning of SPU */
+ p_spu->b_absolute = p_sys->b_absolute;
+ p_spu->i_flags = p_sys->i_spu_position;
+ p_spu->i_x = p_sys->i_spu_x;
+ p_spu->i_y = p_sys->i_spu_y;
+ p_spu->i_original_picture_width = 720;
+ p_spu->i_original_picture_height = 576;
+
+ if( p_sys->p_display )
+ {
+ p_spu->i_original_picture_width = p_sys->p_display->i_width;
+ p_spu->i_original_picture_height = p_sys->p_display->i_height;
+
+ if( p_sys->p_display->b_windowed )
+ {
+ /* TODO: check that this actually works */
+ p_spu->i_original_picture_width = p_sys->p_display->i_max_x - p_sys->p_display->i_x;
+ p_spu->i_original_picture_height = p_sys->p_display->i_max_y - p_sys->p_display->i_y;
+ p_spu->i_x += p_sys->p_display->i_x;
+ p_spu->i_y += p_sys->p_display->i_y;
+ }
+ }
+
+ return p_spu;
+}
+
+/*****************************************************************************
+ * encoder_sys_t : encoder descriptor
+ *****************************************************************************/
+typedef struct encoder_region_t
+{
+ int i_width;
+ int i_height;
+
+} encoder_region_t;
+
+struct encoder_sys_t
+{
+ unsigned int i_page_ver;
+ unsigned int i_region_ver;
+ unsigned int i_clut_ver;
+
+ int i_regions;
+ encoder_region_t *p_regions;
+
+ mtime_t i_pts;
+
+ /* subpicture positioning */
+ int i_offset_x;
+ int i_offset_y;
+};
+
+static void encode_page_composition( encoder_t *, bs_t *, subpicture_t * );
+static void encode_clut( encoder_t *, bs_t *, subpicture_t * );
+static void encode_region_composition( encoder_t *, bs_t *, subpicture_t * );
+static void encode_object( encoder_t *, bs_t *, subpicture_t * );
+
+/*****************************************************************************
+ * OpenEncoder: probe the encoder and return score
+ *****************************************************************************/
+static int OpenEncoder( vlc_object_t *p_this )
+{
+ encoder_t *p_enc = (encoder_t *)p_this;
+ encoder_sys_t *p_sys;
+ vlc_value_t val;
+
+ if( p_enc->fmt_out.i_codec != VLC_FOURCC('d','v','b','s') &&
+ !p_enc->b_force )
+ {
+ return VLC_EGENERIC;
+ }
+
+ /* Allocate the memory needed to store the decoder's structure */
+ if( ( p_sys = (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL )
+ {
+ msg_Err( p_enc, "out of memory" );
+ return VLC_ENOMEM;
+ }
+ p_enc->p_sys = p_sys;
+
+ p_enc->pf_encode_sub = Encode;
+ p_enc->fmt_out.i_codec = VLC_FOURCC('d','v','b','s');
+ p_enc->fmt_out.subs.dvb.i_id = 1 << 16 | 1;
+
+ config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
+
+ p_sys->i_page_ver = 0;
+ p_sys->i_region_ver = 0;
+ p_sys->i_clut_ver = 0;
+ p_sys->i_regions = 0;
+ p_sys->p_regions = 0;
+
+ var_Create( p_this, ENC_CFG_PREFIX "x", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_this, ENC_CFG_PREFIX "x", &val );
+ p_sys->i_offset_x = val.i_int;
+ var_Create( p_this, ENC_CFG_PREFIX "y", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_this, ENC_CFG_PREFIX "y", &val );
+ p_sys->i_offset_y = val.i_int;
+
+ return VLC_SUCCESS;
+}
+
+/* FIXME: this routine is a hack to convert VLC_FOURCC('Y','U','V','A')
+ * into VLC_FOURCC('Y','U','V','P')
+ */
+static subpicture_t *YuvaYuvp( encoder_t *p_enc, subpicture_t *p_subpic )
+{
+ subpicture_region_t *p_region = NULL;
+
+ if( !p_subpic ) return NULL;
+
+ for( p_region = p_subpic->p_region; p_region; p_region = p_region->p_next )
+ {
+ video_format_t *p_fmt = &p_region->fmt;
+ int i = 0, j = 0, n = 0, p = 0;
+ int i_max_entries = 256;
+
+#ifdef RANDOM_DITHERING
+ int i_seed = 0xdeadbeef; /* random seed */
+#else
+ int *pi_delta;
+#endif
+ int i_pixels = p_region->picture.p[0].i_visible_lines
+ * p_region->picture.p[0].i_pitch;
+ int i_iterator = p_region->picture.p[0].i_visible_lines * 3 / 4
+ * p_region->picture.p[0].i_pitch
+ + p_region->picture.p[0].i_pitch * 1 / 3;
+ int i_tolerance = 0;
+
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_enc, "YuvaYuvp: i_pixels=%d, i_iterator=%d", i_pixels, i_iterator );
+#endif
+ p_fmt->i_chroma = VLC_FOURCC('Y','U','V','P');
+ p_fmt->p_palette = (video_palette_t *) malloc( sizeof( video_palette_t ) );
+ if( !p_fmt->p_palette ) break;
+ p_fmt->p_palette->i_entries = 0;
+
+ /* Find best iterator using Euclide’s algorithm */
+ for( ; i_iterator > 1 ; i_iterator-- )
+ {
+ int a = i_pixels;
+ int b = i_iterator;
+ int c;
+
+ while( b )
+ {
+ c = a % b;
+ a = b;
+ b = c;
+ }
+
+ if( a == 1 )
+ {
+ break;
+ }
+ }
+
+ /* Count colors, build best palette */
+ for( i_tolerance = 0; i_tolerance < 128; i_tolerance++ )
+ {
+ vlc_bool_t b_success = VLC_TRUE;
+ p_fmt->p_palette->i_entries = 0;
+
+ for( i = 0; i < i_pixels ; )
{
- if( ShowBits( &p_spudec->bit_stream, 3 ) != 0x00 )
+ uint8_t y, u, v, a;
+ y = p_region->picture.p[0].p_pixels[i];
+ u = p_region->picture.p[1].p_pixels[i];
+ v = p_region->picture.p[2].p_pixels[i];
+ a = p_region->picture.p[3].p_pixels[i];
+ for( j = 0; j < p_fmt->p_palette->i_entries; j++ )
+ {
+ if( abs((int)p_fmt->p_palette->palette[j][0] - (int)y) <= i_tolerance &&
+ abs((int)p_fmt->p_palette->palette[j][1] - (int)u) <= i_tolerance &&
+ abs((int)p_fmt->p_palette->palette[j][2] - (int)v) <= i_tolerance &&
+ abs((int)p_fmt->p_palette->palette[j][3] - (int)a) <= i_tolerance / 2 )
+ {
+ break;
+ }
+ }
+ if( j == p_fmt->p_palette->i_entries )
{
- i_count = 2 + GetBits( &p_spudec->bit_stream, 3 );
- (*p) += i_count ;
- add_rle_code (p_image, i_count, 0x00);
+ p_fmt->p_palette->palette[j][0] = y;
+ p_fmt->p_palette->palette[j][1] = u;
+ p_fmt->p_palette->palette[j][2] = v;
+ p_fmt->p_palette->palette[j][3] = a;
+ p_fmt->p_palette->i_entries++;
}
- else
+ if( p_fmt->p_palette->i_entries >= i_max_entries )
{
- GetBits( &p_spudec->bit_stream, 3);
- b_stop=1;
+ b_success = VLC_FALSE;
+ break;
}
- i_processed += 8;
- }
- else
- {
- if(GetBits( &p_spudec->bit_stream, 1 ) == 0x00) //Switch2
+ i += i_iterator;
+ if( i > i_pixels )
{
- i_count = 4 + GetBits( &p_spudec->bit_stream, 2 );
- i_color = GetBits( &p_spudec->bit_stream, 4 );
- (*p) += i_count;
- i_processed += 12;
- add_rle_code(p_image, i_count, i_color);
+ i -= i_pixels;
}
- else
+ }
+
+ if( b_success )
+ {
+ break;
+ }
+ }
+
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_enc, "best palette has %d colors", p_fmt->p_palette->i_entries );
+#endif
+
+#ifndef RANDOM_DITHERING
+ pi_delta = malloc( ( p_region->picture.p[0].i_pitch + 1 )
+ * sizeof(int) * 4 );
+ for( i = 0; i < (p_region->picture.p[0].i_pitch + 1) * 4 ; i++ )
+ {
+ pi_delta[ i ] = 0;
+ }
+#endif
+
+ /* Fill image with our new colours */
+ for( p = 0; p < p_region->picture.p[0].i_visible_lines ; p++ )
+ {
+ int i_ydelta = 0, i_udelta = 0, i_vdelta = 0, i_adelta = 0;
+
+ for( n = 0; n < p_region->picture.p[0].i_pitch ; n++ )
+ {
+ int i_offset = p * p_region->picture.p[0].i_pitch + n;
+ int y, u, v, a;
+ int i_mindist, i_best;
+
+ y = (int)p_region->picture.p[0].p_pixels[i_offset];
+ u = (int)p_region->picture.p[1].p_pixels[i_offset];
+ v = (int)p_region->picture.p[2].p_pixels[i_offset];
+ a = (int)p_region->picture.p[3].p_pixels[i_offset];
+
+ /* Add dithering compensation */
+#ifdef RANDOM_DITHERING
+ y += ((i_seed & 0xff) - 0x80) * i_tolerance / 0x80;
+ u += (((i_seed >> 8) & 0xff) - 0x80) * i_tolerance / 0x80;
+ v += (((i_seed >> 16) & 0xff) - 0x80) * i_tolerance / 0x80;
+ a += (((i_seed >> 24) & 0xff) - 0x80) * i_tolerance / 0x80;
+#else
+ y += i_ydelta + pi_delta[ n * 4 ];
+ u += i_udelta + pi_delta[ n * 4 + 1 ];
+ v += i_vdelta + pi_delta[ n * 4 + 2 ];
+ a += i_adelta + pi_delta[ n * 4 + 3 ];
+#endif
+
+ /* Find best colour in palette */
+ for( i_mindist = 99999999, i_best = 0, j = 0; j < p_fmt->p_palette->i_entries; j++ )
{
- switch ( GetBits( &p_spudec->bit_stream, 2 ) ) //Switch3
+ int i_dist = 0;
+
+ i_dist += abs((int)p_fmt->p_palette->palette[j][0] - y);
+ i_dist += abs((int)p_fmt->p_palette->palette[j][1] - u);
+ i_dist += abs((int)p_fmt->p_palette->palette[j][2] - v);
+ i_dist += 2 * abs((int)p_fmt->p_palette->palette[j][3] - a);
+
+ if( i_dist < i_mindist )
{
- case 0x0:
- (*p)++;
- i_processed += 8;
- add_rle_code(p_image, 1, 0x00);
- break;
- case 0x1:
- (*p)+=2;
- i_processed += 8;
- add_rle_code(p_image, 2, 0x00);
- break;
- case 0x2:
- i_count = 9 + GetBits( &p_spudec->bit_stream, 4 );
- i_color = GetBits( &p_spudec->bit_stream, 4 );
- (*p)+= i_count;
- i_processed += 16;
- add_rle_code ( p_image, i_count, i_color );
- break;
- case 0x3:
- i_count= 25 + GetBits( &p_spudec->bit_stream, 8 );
- i_color = GetBits( &p_spudec->bit_stream, 4 );
- (*p)+= i_count;
- i_processed += 20;
- add_rle_code ( p_image, i_count, i_color );
- break;
+ i_mindist = i_dist;
+ i_best = j;
}
}
+
+ /* Set pixel to best color */
+ p_region->picture.p[0].p_pixels[i_offset] = i_best;
+
+ /* Update dithering state */
+#ifdef RANDOM_DITHERING
+ i_seed = (i_seed * 0x1283837) ^ 0x789479 ^ (i_seed >> 13);
+#else
+ i_ydelta = y - (int)p_fmt->p_palette->palette[i_best][0];
+ i_udelta = u - (int)p_fmt->p_palette->palette[i_best][1];
+ i_vdelta = v - (int)p_fmt->p_palette->palette[i_best][2];
+ i_adelta = a - (int)p_fmt->p_palette->palette[i_best][3];
+ pi_delta[ n * 4 ] = i_ydelta * 3 / 8;
+ pi_delta[ n * 4 + 1 ] = i_udelta * 3 / 8;
+ pi_delta[ n * 4 + 2 ] = i_vdelta * 3 / 8;
+ pi_delta[ n * 4 + 3 ] = i_adelta * 3 / 8;
+ i_ydelta = i_ydelta * 5 / 8;
+ i_udelta = i_udelta * 5 / 8;
+ i_vdelta = i_vdelta * 5 / 8;
+ i_adelta = i_adelta * 5 / 8;
+#endif
}
}
+#ifndef RANDOM_DITHERING
+ free( pi_delta );
+#endif
+
+ /* pad palette */
+ for( i = p_fmt->p_palette->i_entries; i < i_max_entries; i++ )
+ {
+ p_fmt->p_palette->palette[i][0] = 0;
+ p_fmt->p_palette->palette[i][1] = 0;
+ p_fmt->p_palette->palette[i][2] = 0;
+ p_fmt->p_palette->palette[i][3] = 0;
+ }
+ p_fmt->p_palette->i_entries = i_max_entries;
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_enc, "best palette has %d colors", p_fmt->p_palette->i_entries );
+#endif
}
- RealignBits ( &p_spudec->bit_stream );
- return (i_processed+7)/8 ;
-}
+ return p_subpic;
+} /* End of hack */
-static vlc_bool_t dvbsub_check_page(dvbsub_all_t* dvbsub)
+/****************************************************************************
+ * Encode: the whole thing
+ ****************************************************************************/
+static block_t *Encode( encoder_t *p_enc, subpicture_t *p_subpic )
{
- if(dvbsub->p_page != NULL)
+ subpicture_t *p_temp = NULL;
+ subpicture_region_t *p_region = NULL;
+ bs_t bits, *s = &bits;
+ block_t *p_block;
+
+ if( !p_subpic || !p_subpic->p_region ) return NULL;
+
+ /* FIXME: this is a hack to convert VLC_FOURCC('Y','U','V','A') into
+ * VLC_FOURCC('Y','U','V','P')
+ */
+ p_region = p_subpic->p_region;
+ if( p_region->fmt.i_chroma == VLC_FOURCC('Y','U','V','A') )
{
- if(dvbsub->p_objects != NULL)
- return VLC_TRUE;
+ p_temp = YuvaYuvp( p_enc, p_subpic );
+ if( !p_temp )
+ {
+ msg_Err( p_enc, "no picture in subpicture" );
+ return NULL;
+ }
+ p_region = p_subpic->p_region;
}
- return VLC_FALSE;
-}
-static void free_image (dvbsub_image_t* p_i)
-{
- dvbsub_rle_t* p1;
- dvbsub_rle_t* p2=NULL;
+ /* Sanity check */
+ if( !p_region ) return NULL;
+
+ if( p_region->fmt.i_chroma != VLC_FOURCC('T','E','X','T') &&
+ p_region->fmt.i_chroma != VLC_FOURCC('Y','U','V','P') )
+ {
+ char psz_fourcc[5];
+ memset( &psz_fourcc, 0, sizeof(char)*5 );
+ vlc_fourcc_to_char( p_region->fmt.i_chroma, &psz_fourcc );
+ msg_Err( p_enc, "chroma %4s not supported", &psz_fourcc );
+ return NULL;
+ }
- for( p1 = p_i->p_codes; p1 != NULL; p1=p2)
+ if( p_region->fmt.p_palette )
{
- p2=p1->p_next;
- trox_free(p1);
- p1=NULL;
+ switch( p_region->fmt.p_palette->i_entries )
+ {
+ case 0:
+ case 4:
+ case 16:
+ case 256:
+ break;
+ default:
+ msg_Err( p_enc, "subpicture palette (%d) not handled",
+ p_region->fmt.p_palette->i_entries );
+ return NULL;
+ }
}
+ /* End of hack */
- trox_free(p_i);
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_enc, "encoding subpicture" );
+#endif
+ p_block = block_New( p_enc, 64000 );
+ bs_init( s, p_block->p_buffer, p_block->i_buffer );
+
+ bs_write( s, 8, 0x20 ); /* Data identifier */
+ bs_write( s, 8, 0x0 ); /* Subtitle stream id */
+
+ encode_page_composition( p_enc, s, p_subpic );
+ encode_region_composition( p_enc, s, p_subpic );
+ encode_clut( p_enc, s, p_subpic );
+ encode_object( p_enc, s, p_subpic );
+
+ /* End of display */
+ bs_write( s, 8, 0x0f ); /* Sync byte */
+ bs_write( s, 8, DVBSUB_ST_ENDOFDISPLAY ); /* Segment type */
+ bs_write( s, 16, 1 ); /* Page id */
+ bs_write( s, 16, 0 ); /* Segment length */
+
+ bs_write( s, 8, 0xff );/* End marker */
+ p_block->i_buffer = bs_pos( s ) / 8;
+ p_block->i_pts = p_block->i_dts = p_subpic->i_start;
+ if( !p_subpic->b_ephemer && p_subpic->i_stop > p_subpic->i_start )
+ {
+ block_t *p_block_stop;
+
+ p_block->i_length = p_subpic->i_stop - p_subpic->i_start;
+
+ /* Send another (empty) subtitle to signal the end of display */
+ p_block_stop = block_New( p_enc, 64000 );
+ bs_init( s, p_block_stop->p_buffer, p_block_stop->i_buffer );
+ bs_write( s, 8, 0x20 ); /* Data identifier */
+ bs_write( s, 8, 0x0 ); /* Subtitle stream id */
+ encode_page_composition( p_enc, s, 0 );
+ bs_write( s, 8, 0x0f ); /* Sync byte */
+ bs_write( s, 8, DVBSUB_ST_ENDOFDISPLAY ); /* Segment type */
+ bs_write( s, 16, 1 ); /* Page id */
+ bs_write( s, 16, 0 ); /* Segment length */
+ bs_write( s, 8, 0xff );/* End marker */
+ p_block_stop->i_buffer = bs_pos( s ) / 8;
+ p_block_stop->i_pts = p_block_stop->i_dts = p_subpic->i_stop;
+ block_ChainAppend( &p_block, p_block_stop );
+ p_block_stop->i_length = 100000; /* p_subpic->i_stop - p_subpic->i_start; */
+ }
+#ifdef DEBUG_DVBSUB
+ msg_Dbg( p_enc, "subpicture encoded properly" );
+#endif
+ return p_block;
}
-static void free_object (dvbsub_object_t* p_o)
+/*****************************************************************************
+ * CloseEncoder: encoder destruction
+ *****************************************************************************/
+static void CloseEncoder( vlc_object_t *p_this )
{
- trox_free(p_o);
+ encoder_t *p_enc = (encoder_t *)p_this;
+ encoder_sys_t *p_sys = p_enc->p_sys;
+
+ var_Destroy( p_this , ENC_CFG_PREFIX "x" );
+ var_Destroy( p_this , ENC_CFG_PREFIX "y" );
+ var_Destroy( p_this , ENC_CFG_PREFIX "timeout" );
+
+ if( p_sys->i_regions ) free( p_sys->p_regions );
+ free( p_sys );
}
-static void free_objectdefs ( dvbsub_objectdef_t* p_o)
+static void encode_page_composition( encoder_t *p_enc, bs_t *s,
+ subpicture_t *p_subpic )
{
- dvbsub_objectdef_t* p1;
- dvbsub_objectdef_t* p2=NULL;
+ encoder_sys_t *p_sys = p_enc->p_sys;
+ subpicture_region_t *p_region;
+ vlc_bool_t b_mode_change = VLC_FALSE;
+ int i_regions, i_timeout;
+
+ bs_write( s, 8, 0x0f ); /* Sync byte */
+ bs_write( s, 8, DVBSUB_ST_PAGE_COMPOSITION ); /* Segment type */
+ bs_write( s, 16, 1 ); /* Page id */
+
+ for( i_regions = 0, p_region = p_subpic ? p_subpic->p_region : 0;
+ p_region; p_region = p_region->p_next, i_regions++ )
+ {
+ if( i_regions >= p_sys->i_regions )
+ {
+ encoder_region_t region;
+ region.i_width = region.i_height = 0;
+ p_sys->p_regions =
+ realloc( p_sys->p_regions, sizeof(encoder_region_t) *
+ (p_sys->i_regions + 1) );
+ p_sys->p_regions[p_sys->i_regions++] = region;
+ }
+
+ if( ( p_sys->p_regions[i_regions].i_width <
+ (int)p_region->fmt.i_visible_width ) ||
+ ( p_sys->p_regions[i_regions].i_width >
+ (int)p_region->fmt.i_visible_width ) )
+ {
+ b_mode_change = VLC_TRUE;
+ msg_Dbg( p_enc, "region %i width change: %i -> %i",
+ i_regions, p_sys->p_regions[i_regions].i_width,
+ p_region->fmt.i_visible_width );
+ p_sys->p_regions[i_regions].i_width =
+ p_region->fmt.i_visible_width;
+ }
+ if( p_sys->p_regions[i_regions].i_height <
+ (int)p_region->fmt.i_visible_height )
+ {
+ b_mode_change = VLC_TRUE;
+ msg_Dbg( p_enc, "region %i height change: %i -> %i",
+ i_regions, p_sys->p_regions[i_regions].i_height,
+ p_region->fmt.i_visible_height );
+ p_sys->p_regions[i_regions].i_height =
+ p_region->fmt.i_visible_height;
+ }
+ }
- for( p1 = p_o; p1 != NULL; p1=p2)
+ bs_write( s, 16, i_regions * 6 + 2 ); /* Segment length */
+
+ i_timeout = 0;
+ if( p_subpic && !p_subpic->b_ephemer &&
+ p_subpic->i_stop > p_subpic->i_start )
{
- p2=p1->p_next;
- trox_free(p1);
- p1=NULL;
+ i_timeout = (p_subpic->i_stop - p_subpic->i_start) / 1000000;
}
-}
-static void free_regions (dvbsub_region_t* p_r, uint8_t nb)
-{
- unsigned int i;
+ bs_write( s, 8, i_timeout ); /* Timeout */
+ bs_write( s, 4, p_sys->i_page_ver++ );
+ bs_write( s, 2, b_mode_change ?
+ DVBSUB_PCS_STATE_CHANGE : DVBSUB_PCS_STATE_ACQUISITION );
+ bs_write( s, 2, 0 ); /* Reserved */
- for (i = 0; i<nb; i++) free_objectdefs ( p_r[i].p_object );
- trox_free (p_r);
- p_r = NULL;
+ for( i_regions = 0, p_region = p_subpic ? p_subpic->p_region : 0;
+ p_region; p_region = p_region->p_next, i_regions++ )
+ {
+ bs_write( s, 8, i_regions );
+ bs_write( s, 8, 0 ); /* Reserved */
+ if( (p_sys->i_offset_x > 0) && (p_sys->i_offset_y > 0) )
+ {
+ bs_write( s, 16, p_sys->i_offset_x ); /* override x position */
+ bs_write( s, 16, p_sys->i_offset_y ); /* override y position */
+ }
+ else
+ {
+ bs_write( s, 16, p_subpic->i_x + p_region->i_x );
+ bs_write( s, 16, p_subpic->i_y + p_region->i_y );
+ }
+ }
}
-static void free_objects (dvbsub_object_t* p_o)
+static void encode_clut( encoder_t *p_enc, bs_t *s, subpicture_t *p_subpic )
{
- dvbsub_object_t* p1;
- dvbsub_object_t* p2=NULL;
+ encoder_sys_t *p_sys = p_enc->p_sys;
+ subpicture_region_t *p_region = p_subpic->p_region;
+ video_palette_t *p_pal, pal;
+ int i;
- for( p1 = p_o; p1 != NULL; p1=p2)
+ /* Sanity check */
+ if( !p_region ) return;
+
+ if( p_region->fmt.i_chroma == VLC_FOURCC('Y','U','V','P') )
{
- p2=p1->p_next;
- free_image (p1->topfield);
- free_image (p1->bottomfield);
- free_object(p1);
+ p_pal = p_region->fmt.p_palette;
+ }
+ else
+ {
+ pal.i_entries = 4;
+ for( i = 0; i < 4; i++ )
+ {
+ pal.palette[i][0] = 0;
+ pal.palette[i][1] = 0;
+ pal.palette[i][2] = 0;
+ pal.palette[i][3] = 0;
+ }
+ p_pal = &pal;
}
-}
-static void free_clut ( dvbsub_clut_t* p_c) { trox_free(p_c); }
+ bs_write( s, 8, 0x0f ); /* Sync byte */
+ bs_write( s, 8, DVBSUB_ST_CLUT_DEFINITION ); /* Segment type */
+ bs_write( s, 16, 1 ); /* Page id */
-static void free_page (dvbsub_page_t* p_p)
-{
- free_regions (p_p->regions, p_p->i_regions_number);
- trox_free(p_p);
- p_p = NULL;
+ bs_write( s, 16, p_pal->i_entries * 6 + 2 ); /* Segment length */
+ bs_write( s, 8, 1 ); /* Clut id */
+ bs_write( s, 4, p_sys->i_clut_ver++ );
+ bs_write( s, 4, 0 ); /* Reserved */
+
+ for( i = 0; i < p_pal->i_entries; i++ )
+ {
+ bs_write( s, 8, i ); /* Clut entry id */
+ bs_write( s, 1, p_pal->i_entries == 4 ); /* 2bit/entry flag */
+ bs_write( s, 1, p_pal->i_entries == 16 ); /* 4bit/entry flag */
+ bs_write( s, 1, p_pal->i_entries == 256 ); /* 8bit/entry flag */
+ bs_write( s, 4, 0 ); /* Reserved */
+ bs_write( s, 1, 1 ); /* Full range flag */
+ bs_write( s, 8, p_pal->palette[i][3] ? /* Y value */
+ (p_pal->palette[i][0] ? p_pal->palette[i][0] : 16) : 0 );
+ bs_write( s, 8, p_pal->palette[i][1] ); /* Cr value */
+ bs_write( s, 8, p_pal->palette[i][2] ); /* Cb value */
+ bs_write( s, 8, 0xff - p_pal->palette[i][3] ); /* T value */
+ }
}
-static void free_spu( subpicture_t *p_spu )
+static void encode_region_composition( encoder_t *p_enc, bs_t *s,
+ subpicture_t *p_subpic )
{
- if ( p_spu->p_sys )
+ encoder_sys_t *p_sys = p_enc->p_sys;
+ subpicture_region_t *p_region;
+ int i_region;
+
+ for( i_region = 0, p_region = p_subpic->p_region; p_region;
+ p_region = p_region->p_next, i_region++ )
{
- free_image(((dvbsub_render_t *)p_spu->p_sys->p_data)->p_rle_top);
- free_image(((dvbsub_render_t *)p_spu->p_sys->p_data)->p_rle_bot);
- trox_free(p_spu->p_sys->p_data);
- trox_free( p_spu->p_sys );
- p_spu->p_sys = NULL;
+ int i_entries = 4, i_depth = 0x1, i_bg = 0;
+ vlc_bool_t b_text =
+ p_region->fmt.i_chroma == VLC_FOURCC('T','E','X','T');
+
+ if( !b_text )
+ {
+ video_palette_t *p_pal = p_region->fmt.p_palette;
+
+ if( !p_pal )
+ {
+ msg_Err( p_enc, "subpicture has no palette - ignoring it" );
+ break;
+ }
+
+ i_entries = p_pal->i_entries;
+ i_depth = i_entries == 4 ? 0x1 : i_entries == 16 ? 0x2 : 0x3;
+
+ for( i_bg = 0; i_bg < p_pal->i_entries; i_bg++ )
+ {
+ if( !p_pal->palette[i_bg][3] ) break;
+ }
+ }
+
+ bs_write( s, 8, 0x0f ); /* Sync byte */
+ bs_write( s, 8, DVBSUB_ST_REGION_COMPOSITION ); /* Segment type */
+ bs_write( s, 16, 1 ); /* Page id */
+
+ bs_write( s, 16, 10 + 6 + (b_text ? 2 : 0) ); /* Segment length */
+ bs_write( s, 8, i_region );
+ bs_write( s, 4, p_sys->i_region_ver++ );
+
+ /* Region attributes */
+ bs_write( s, 1, i_bg < i_entries ); /* Fill */
+ bs_write( s, 3, 0 ); /* Reserved */
+ bs_write( s, 16, p_sys->p_regions[i_region].i_width );
+ bs_write( s, 16, p_sys->p_regions[i_region].i_height );
+ bs_write( s, 3, i_depth ); /* Region level of compatibility */
+ bs_write( s, 3, i_depth ); /* Region depth */
+ bs_write( s, 2, 0 ); /* Reserved */
+ bs_write( s, 8, 1 ); /* Clut id */
+ bs_write( s, 8, i_bg ); /* region 8bit pixel code */
+ bs_write( s, 4, i_bg ); /* region 4bit pixel code */
+ bs_write( s, 2, i_bg ); /* region 2bit pixel code */
+ bs_write( s, 2, 0 ); /* Reserved */
+
+ /* In our implementation we only have 1 object per region */
+ bs_write( s, 16, i_region );
+ bs_write( s, 2, b_text ? DVBSUB_OT_BASIC_CHAR:DVBSUB_OT_BASIC_BITMAP );
+ bs_write( s, 2, 0 ); /* object provider flag */
+ bs_write( s, 12, 0 );/* object horizontal position */
+ bs_write( s, 4, 0 ); /* Reserved */
+ bs_write( s, 12, 0 );/* object vertical position */
+
+ if( b_text )
+ {
+ bs_write( s, 8, 1 ); /* foreground pixel code */
+ bs_write( s, 8, 0 ); /* background pixel code */
+ }
}
}
-static void free_all ( dvbsub_all_t* p_a )
+static void encode_pixel_data( encoder_t *p_enc, bs_t *s,
+ subpicture_region_t *p_region,
+ vlc_bool_t b_top );
+
+static void encode_object( encoder_t *p_enc, bs_t *s, subpicture_t *p_subpic )
{
- unsigned int i;
+ encoder_sys_t *p_sys = p_enc->p_sys;
+ subpicture_region_t *p_region;
+ int i_region;
+
+ int i_length_pos, i_update_pos, i_pixel_data_pos;
+
+ for( i_region = 0, p_region = p_subpic->p_region; p_region;
+ p_region = p_region->p_next, i_region++ )
+ {
+ bs_write( s, 8, 0x0f ); /* Sync byte */
+ bs_write( s, 8, DVBSUB_ST_OBJECT_DATA ); /* Segment type */
+ bs_write( s, 16, 1 ); /* Page id */
- for(i=0; i<0xff; i++) if (p_a->p_clut[i]) free_clut ( p_a->p_clut[i] );
- for(i=0; i<16; i++) if (p_a->p_spu[i]) free_spu ( p_a->p_spu[i] );
- if(p_a->p_page) free_page( p_a->p_page );
- free_objects (p_a->p_objects);
+ i_length_pos = bs_pos( s );
+ bs_write( s, 16, 0 ); /* Segment length */
+ bs_write( s, 16, i_region ); /* Object id */
+ bs_write( s, 4, p_sys->i_region_ver++ );
+
+ /* object coding method */
+ switch( p_region->fmt.i_chroma )
+ {
+ case VLC_FOURCC( 'Y','U','V','P' ):
+ bs_write( s, 2, 0 );
+ break;
+ case VLC_FOURCC( 'T','E','X','T' ):
+ bs_write( s, 2, 1 );
+ break;
+ default:
+ msg_Err( p_enc, "FOURCC %d not supported by encoder.", p_region->fmt.i_chroma );
+ continue;
+ }
+
+ bs_write( s, 1, 0 ); /* non modifying color flag */
+ bs_write( s, 1, 0 ); /* Reserved */
+
+ if( p_region->fmt.i_chroma == VLC_FOURCC( 'T','E','X','T' ) )
+ {
+ int i_size, i;
+
+ if( !p_region->psz_text ) continue;
+
+ i_size = __MIN( strlen( p_region->psz_text ), 256 );
+
+ bs_write( s, 8, i_size ); /* number of characters in string */
+ for( i = 0; i < i_size; i++ )
+ {
+ bs_write( s, 16, p_region->psz_text[i] );
+ }
+
+ /* Update segment length */
+ SetWBE( &s->p_start[i_length_pos/8],
+ (bs_pos(s) - i_length_pos)/8 -2 );
+ continue;
+ }
+ /* Coding of a bitmap object */
+ i_update_pos = bs_pos( s );
+ bs_write( s, 16, 0 ); /* topfield data block length */
+ bs_write( s, 16, 0 ); /* bottomfield data block length */
+
+ /* Top field */
+ i_pixel_data_pos = bs_pos( s );
+ encode_pixel_data( p_enc, s, p_region, VLC_TRUE );
+ i_pixel_data_pos = ( bs_pos( s ) - i_pixel_data_pos ) / 8;
+ SetWBE( &s->p_start[i_update_pos/8], i_pixel_data_pos );
+
+ /* Bottom field */
+ i_pixel_data_pos = bs_pos( s );
+ encode_pixel_data( p_enc, s, p_region, VLC_FALSE );
+ i_pixel_data_pos = ( bs_pos( s ) - i_pixel_data_pos ) / 8;
+ SetWBE( &s->p_start[i_update_pos/8+2], i_pixel_data_pos );
+
+ /* Stuffing for word alignment */
+ bs_align_0( s );
+ if( bs_pos( s ) % 16 ) bs_write( s, 8, 0 );
+
+ /* Update segment length */
+ SetWBE( &s->p_start[i_length_pos/8], (bs_pos(s) - i_length_pos)/8 -2 );
+ }
}
-static void dvbsub_RenderDVBSUB ( vout_thread_t *p_vout, picture_t *p_pic,
- const subpicture_t *p_spu, vlc_bool_t b_crop )
+static void encode_pixel_line_2bp( encoder_t *p_enc, bs_t *s,
+ subpicture_region_t *p_region,
+ int i_line );
+static void encode_pixel_line_4bp( encoder_t *p_enc, bs_t *s,
+ subpicture_region_t *p_region,
+ int i_line );
+static void encode_pixel_line_8bp( encoder_t *p_enc, bs_t *s,
+ subpicture_region_t *p_region,
+ int i_line );
+static void encode_pixel_data( encoder_t *p_enc, bs_t *s,
+ subpicture_region_t *p_region,
+ vlc_bool_t b_top )
{
- // If we have changed the language on the fly,
- if(!p_spu->p_sys) return;
-
- if(p_spu->p_sys->b_obsolete) return;
-
- switch (p_vout->output.i_chroma)
- {
- /* I420 target, no scaling */
- case VLC_FOURCC('I','4','2','2'):
- case VLC_FOURCC('I','4','2','0'):
- case VLC_FOURCC('I','Y','U','V'):
- case VLC_FOURCC('Y','V','1','2'):
- // As long as we just use Y info, I422 and YV12 are just equivalent
- // to I420. Remember to change it the day we'll take into account
- // U and V info.
- RenderI42x( p_vout, p_pic, p_spu, VLC_FALSE );
+ unsigned int i_line;
+
+ /* Sanity check */
+ if( p_region->fmt.i_chroma != VLC_FOURCC('Y','U','V','P') ) return;
+
+ /* Encode line by line */
+ for( i_line = !b_top; i_line < p_region->fmt.i_visible_height;
+ i_line += 2 )
+ {
+ switch( p_region->fmt.p_palette->i_entries )
+ {
+ case 0:
break;
- /* RV16 target, scaling */
- case VLC_FOURCC('R','V','1','6'):
- fprintf(stderr, "Not implemented chroma ! RV16)\n");
- //RenderRV16( p_vout, p_pic, p_spu, p_spu->p_sys->b_crop );
+
+ case 4:
+ bs_write( s, 8, 0x10 ); /* 2 bit/pixel code string */
+ encode_pixel_line_2bp( p_enc, s, p_region, i_line );
break;
- /* RV32 target, scaling */
- case VLC_FOURCC('R','V','2','4'):
- case VLC_FOURCC('R','V','3','2'):
- fprintf(stderr, "Not implemented chroma ! RV32 \n");
- //RenderRV32( p_vout, p_pic, p_spu, p_spu->p_sys->b_crop );
+
+ case 16:
+ bs_write( s, 8, 0x11 ); /* 4 bit/pixel code string */
+ encode_pixel_line_4bp( p_enc, s, p_region, i_line );
break;
- /* NVidia overlay, no scaling */
- case VLC_FOURCC('Y','U','Y','2'):
- RenderYUY2( p_vout, p_pic, p_spu, VLC_FALSE );
+
+ case 256:
+ bs_write( s, 8, 0x12 ); /* 8 bit/pixel code string */
+ encode_pixel_line_8bp( p_enc, s, p_region, i_line );
break;
+
default:
- msg_Err( p_vout, "unknown chroma, can't render SPU" );
+ msg_Err( p_enc, "subpicture palette (%i) not handled",
+ p_region->fmt.p_palette->i_entries );
break;
+ }
+
+ bs_write( s, 8, 0xf0 ); /* End of object line code */
}
}
-
-static void RenderYUY2 ( vout_thread_t *p_vout, picture_t *p_pic,
- const subpicture_t *p_spu, vlc_bool_t b_crop )
+static void encode_pixel_line_2bp( encoder_t *p_enc, bs_t *s,
+ subpicture_region_t *p_region,
+ int i_line )
{
- /* Common variables */
- uint8_t *p_desty;
- uint16_t i,j;
- uint16_t i_cnt;
- uint16_t x, y;
- dvbsub_rle_t* p_c;
- dvbsub_render_t* p_r = ((dvbsub_render_t *)p_spu->p_sys->p_data);
- dvbsub_image_t* p_im = p_r->p_rle_top;
- i=0;
- j=0;
- p_desty = p_pic->Y_PIXELS;
- //let's render the 1st frame
- for(p_c = p_im->p_codes; p_c->p_next != NULL; p_c=p_c->p_next)
- {
-// if( p_c->y != 0 && p_c->t < 0x20)
- if( p_c->y != 0 && p_c->t < 0x20)
+ unsigned int i, i_length = 0;
+ int i_pitch = p_region->picture.p->i_pitch;
+ uint8_t *p_data = &p_region->picture.p->p_pixels[ i_pitch * i_line ];
+ int i_last_pixel = p_data[0];
+
+ for( i = 0; i <= p_region->fmt.i_visible_width; i++ )
+ {
+ if( i != p_region->fmt.i_visible_width &&
+ p_data[i] == i_last_pixel && i_length != 284 )
{
- x = j+ p_r->i_x;
- y = 2*i+p_r->i_y;
- //memset(p_desty+ y*p_pic->Y_PITCH + x, p_c->y, p_c->i_num);
- // In YUY2 we have to set pixel per pixel
- for( i_cnt = 0; i_cnt < p_c->i_num; i_cnt+=2 )
- {
- memset(p_desty+ y*p_pic->Y_PITCH + 2*x + i_cnt, p_c->y, 1);
- // memset(p_desty+ y*p_pic->Y_PITCH + 2*x + i_cnt+1, p_c->cr, 1);
- // memset(p_desty+ y*p_pic->Y_PITCH + 2*x + i_cnt+2, p_c->y, 1);
- // memset(p_desty+ y*p_pic->Y_PITCH + 2*x + i_cnt+3, p_c->cb, 1);
- }
+ i_length++;
+ continue;
}
- j += p_c->i_num;
- if(j >= p_im->i_cols[i])
+
+ if( i_length == 1 || i_length == 11 || i_length == 28 )
{
- i++; j=0;
+ /* 2bit/pixel code */
+ if( i_last_pixel ) bs_write( s, 2, i_last_pixel );
+ else
+ {
+ bs_write( s, 2, 0 );
+ bs_write( s, 1, 0 );
+ bs_write( s, 1, 1 ); /* pseudo color 0 */
+ }
+ i_length--;
}
- if( i>= p_im->i_rows) break;
- }
- //idem for the second frame
- p_im = p_r->p_rle_bot; i=0; j=0;
- for(p_c = p_im->p_codes; p_c->p_next != NULL; p_c=p_c->p_next)
- {
- if( p_c->y != 0 && p_c->t < 0x20)
+
+ if( i_length == 2 )
{
- x = j+ p_r->i_x;
- y = 2*i+1+p_r->i_y;
- //memset(p_desty+ y*p_pic->Y_PITCH + x, p_c->y, p_c->i_num);
- // In YUY2 we have to set pixel per pixel
- for( i_cnt = 0; i_cnt < p_c->i_num; i_cnt+=2 )
+ if( i_last_pixel )
+ {
+ bs_write( s, 2, i_last_pixel );
+ bs_write( s, 2, i_last_pixel );
+ }
+ else
{
- memset(p_desty+ y*p_pic->Y_PITCH + 2*x + i_cnt, p_c->y, 1);
- // memset(p_desty+ y*p_pic->Y_PITCH + 2*x + i_cnt+1, p_c->cr, 1);
- // memset(p_desty+ y*p_pic->Y_PITCH + 2*x + i_cnt+2, p_c->y, 1);
- // memset(p_desty+ y*p_pic->Y_PITCH + 2*x + i_cnt+3, p_c->cb, 1);
- }
+ bs_write( s, 2, 0 );
+ bs_write( s, 1, 0 );
+ bs_write( s, 1, 0 );
+ bs_write( s, 2, 1 ); /* 2 * pseudo color 0 */
+ }
}
- j += p_c->i_num;
- if(j >= p_im->i_cols[i])
+ else if( i_length > 2 )
{
- i++; j=0;
+ bs_write( s, 2, 0 );
+ if( i_length <= 10 )
+ {
+ bs_write( s, 1, 1 );
+ bs_write( s, 3, i_length - 3 );
+ bs_write( s, 2, i_last_pixel );
+ }
+ else
+ {
+ bs_write( s, 1, 0 );
+ bs_write( s, 1, 0 );
+
+ if( i_length <= 27 )
+ {
+ bs_write( s, 2, 2 );
+ bs_write( s, 4, i_length - 12 );
+ bs_write( s, 2, i_last_pixel );
+ }
+ else
+ {
+ bs_write( s, 2, 3 );
+ bs_write( s, 8, i_length - 29 );
+ bs_write( s, 2, i_last_pixel );
+ }
+ }
}
- if( i>= p_im->i_rows) break;
+
+ if( i == p_region->fmt.i_visible_width ) break;
+
+ i_last_pixel = p_data[i];
+ i_length = 1;
}
-}
+ /* Stop */
+ bs_write( s, 2, 0 );
+ bs_write( s, 1, 0 );
+ bs_write( s, 1, 0 );
+ bs_write( s, 2, 0 );
+
+ /* Stuffing */
+ bs_align_0( s );
+}
-static void RenderI42x ( vout_thread_t *p_vout, picture_t *p_pic,
- const subpicture_t *p_spu, vlc_bool_t b_crop )
+static void encode_pixel_line_4bp( encoder_t *p_enc, bs_t *s,
+ subpicture_region_t *p_region,
+ int i_line )
{
- /* Common variables */
- uint8_t *p_desty;
- uint8_t *p_destu;
- uint8_t *p_destv;
- uint16_t i,j;
- uint16_t x, y;
- dvbsub_rle_t* p_c;
- dvbsub_render_t* p_r = ((dvbsub_render_t *)p_spu->p_sys->p_data);
- dvbsub_image_t* p_im = p_r->p_rle_top;
- i=0;
- j=0;
- p_desty = p_pic->Y_PIXELS;
- p_destu = p_pic->U_PIXELS;
- p_destv = p_pic->V_PIXELS;
- //let's render the 1st frame
- for(p_c = p_im->p_codes; p_c->p_next != NULL; p_c=p_c->p_next)
- {
- if( p_c->y != 0 )
+ unsigned int i, i_length = 0;
+ int i_pitch = p_region->picture.p->i_pitch;
+ uint8_t *p_data = &p_region->picture.p->p_pixels[ i_pitch * i_line ];
+ int i_last_pixel = p_data[0];
+
+ for( i = 0; i <= p_region->fmt.i_visible_width; i++ )
+ {
+ if( i != p_region->fmt.i_visible_width &&
+ p_data[i] == i_last_pixel && i_length != 280 )
+ {
+ i_length++;
+ continue;
+ }
+
+ if( i_length == 1 || (i_length == 3 && i_last_pixel) || i_length == 8 )
{
- x = j+ p_r->i_x;
- y = 2*i+p_r->i_y;
- //memset(p_dest+ y*p_pic->U_PITCH*2 + x, p_c->cr, p_c->i_num);
-// memset(p_desty+ (y)*p_pic->Y_PITCH + x, p_c->cr, p_c->i_num);
- //memset(p_dest+ y*p_pic->V_PITCH*2 + x, p_c->cb, p_c->i_num);
- //memset(p_destu+ (y)*p_pic->Y_PITCH + x, p_c->cb, p_c->i_num);
- memset(p_desty+ y*p_pic->Y_PITCH + x, p_c->y, p_c->i_num);
- // memset(p_desty+ 2*y*p_pic->U_PITCH + x, p_c->cr, p_c->i_num);
- // memset(p_desty+ 2*y*p_pic->V_PITCH + x, p_c->cb, p_c->i_num);
+ /* 4bit/pixel code */
+ if( i_last_pixel ) bs_write( s, 4, i_last_pixel );
+ else
+ {
+ bs_write( s, 4, 0 );
+ bs_write( s, 1, 1 );
+ bs_write( s, 1, 1 );
+ bs_write( s, 2, 0 ); /* pseudo color 0 */
+ }
+ i_length--;
}
- j += p_c->i_num;
- if(j >= p_im->i_cols[i])
+
+ if( i_length == 2 )
{
- i++; j=0;
+ if( i_last_pixel )
+ {
+ bs_write( s, 4, i_last_pixel );
+ bs_write( s, 4, i_last_pixel );
+ }
+ else
+ {
+ bs_write( s, 4, 0 );
+ bs_write( s, 1, 1 );
+ bs_write( s, 1, 1 );
+ bs_write( s, 2, 1 ); /* 2 * pseudo color 0 */
+ }
}
- if( i>= p_im->i_rows) break;
- }
- //idem for the second frame
- p_im = p_r->p_rle_bot; i=0; j=0;
- for(p_c = p_im->p_codes; p_c->p_next != NULL; p_c=p_c->p_next)
- {
- if( p_c->y != 0 && p_c->t < 0x20)
+ else if( !i_last_pixel && i_length >= 3 && i_length <= 9 )
{
- x = j+ p_r->i_x;
- y = 2*i+1+p_r->i_y;
-// memset(p_desty+ y*p_pic->U_PITCH*2 + x, p_c->cr, p_c->i_num);
-// memset(p_desty+ y*p_pic->V_PITCH*2 + x, p_c->cb, p_c->i_num);
- memset(p_desty+ y*p_pic->Y_PITCH + x, p_c->y, p_c->i_num);
-// memset(p_desty+ 2*y*p_pic->U_PITCH + x, p_c->cr, p_c->i_num);
-// memset(p_desty+ 2*y*p_pic->V_PITCH + x, p_c->cb, p_c->i_num);
+ bs_write( s, 4, 0 );
+ bs_write( s, 1, 0 );
+ bs_write( s, 3, i_length - 2 ); /* (i_length - 2) * color 0 */
}
- j += p_c->i_num;
- if(j >= p_im->i_cols[i])
+ else if( i_length > 2 )
{
- i++; j=0;
+ bs_write( s, 4, 0 );
+ bs_write( s, 1, 1 );
+
+ if( i_length <= 7 )
+ {
+ bs_write( s, 1, 0 );
+ bs_write( s, 2, i_length - 4 );
+ bs_write( s, 4, i_last_pixel );
+ }
+ else
+ {
+ bs_write( s, 1, 1 );
+
+ if( i_length <= 24 )
+ {
+ bs_write( s, 2, 2 );
+ bs_write( s, 4, i_length - 9 );
+ bs_write( s, 4, i_last_pixel );
+ }
+ else
+ {
+ bs_write( s, 2, 3 );
+ bs_write( s, 8, i_length - 25 );
+ bs_write( s, 4, i_last_pixel );
+ }
+ }
}
- if( i>= p_im->i_rows) break;
+
+ if( i == p_region->fmt.i_visible_width ) break;
+
+ i_last_pixel = p_data[i];
+ i_length = 1;
}
-}
-static void dvbsub_Destroy( subpicture_t *p_spu )
-{
- free_spu( p_spu );
+ /* Stop */
+ bs_write( s, 8, 0 );
+
+ /* Stuffing */
+ bs_align_0( s );
}
-static void dvbsub_render( dvbsub_thread_t *p_dec, dvbsub_all_t* dvbsub)
+static void encode_pixel_line_8bp( encoder_t *p_enc, bs_t *s,
+ subpicture_region_t *p_region,
+ int i_line )
{
- dvbsub_region_t* p_region;
- dvbsub_objectdef_t* p_objectdef;
- dvbsub_object_t* p_o;
- dvbsub_object_t* p_object;
- dvbsub_object_t* p_object_old;
- dvbsub_render_t* p_render;
- dvbsub_rle_t* p_c;
- uint8_t i,j;
- j=0;
- /* loop on regions */
- for(i=0; i< dvbsub->p_page->i_regions_number; i++)
- {
- p_region = &(dvbsub->p_page->regions[i]);
- /* loop on objects */
- for(p_objectdef = p_region->p_object;
- p_objectdef != NULL;
- p_objectdef = p_objectdef->p_next)
- {
- /* Look for the right object */
- p_object = dvbsub->p_objects;
- while((p_object!=NULL) && (p_object->i_id != p_objectdef->i_id))
+ unsigned int i, i_length = 0;
+ int i_pitch = p_region->picture.p->i_pitch;
+ uint8_t *p_data = &p_region->picture.p->p_pixels[ i_pitch * i_line ];
+ int i_last_pixel = p_data[0];
+
+ for( i = 0; i <= p_region->fmt.i_visible_width; i++ )
+ {
+ if( i != p_region->fmt.i_visible_width &&
+ p_data[i] == i_last_pixel && i_length != 127 )
{
- p_object = p_object->p_next;
+ i_length++;
+ continue;
}
- if(p_object==NULL)
+
+ if( i_length == 1 && i_last_pixel )
{
- fprintf(stderr, "Internal DvbSub decoder error\n");
- return;
+ /* 8bit/pixel code */
+ bs_write( s, 8, i_last_pixel );
}
- /* Allocate the render structure */
- p_render = trox_malloc(sizeof(dvbsub_render_t));
- p_render->i_x = p_region->i_x + p_objectdef->i_xoffset;
- p_render->i_y = p_region->i_y + p_objectdef->i_yoffset;
- p_render->p_rle_top = p_object->topfield;
- p_render->p_rle_bot = p_object->bottomfield;
-
- // if we did not recieved the CLUT yet
- if ( !dvbsub->p_clut[p_region->i_clut] ) return;
-
- /* Compute the color datas according to the appropriate CLUT */
- for(p_c=p_render->p_rle_top->p_codes;p_c->p_next!=NULL; p_c=p_c->p_next)
+ else if( i_length == 2 && i_last_pixel )
{
- //TODO We assume here we are working in 4bp
- p_c->y=dvbsub->p_clut[p_region->i_clut]->c_4b[p_c->i_color_code].Y;
- p_c->cr=dvbsub->p_clut[p_region->i_clut]->c_4b[p_c->i_color_code].Cr;
- p_c->cb=dvbsub->p_clut[p_region->i_clut]->c_4b[p_c->i_color_code].Cb;
- p_c->t=dvbsub->p_clut[p_region->i_clut]->c_4b[p_c->i_color_code].T;
+ /* 8bit/pixel code */
+ bs_write( s, 8, i_last_pixel );
+ bs_write( s, 8, i_last_pixel );
}
- for(p_c=p_render->p_rle_bot->p_codes;p_c->p_next!=NULL; p_c=p_c->p_next)
+ else if( i_length <= 127 )
{
- //TODO We assume here we are working in 4bp
- p_c->y=dvbsub->p_clut[p_region->i_clut]->c_4b[p_c->i_color_code].Y;
- p_c->cr=dvbsub->p_clut[p_region->i_clut]->c_4b[p_c->i_color_code].Cr;
- p_c->cb=dvbsub->p_clut[p_region->i_clut]->c_4b[p_c->i_color_code].Cb;
- p_c->t=dvbsub->p_clut[p_region->i_clut]->c_4b[p_c->i_color_code].T;
- }
-
+ bs_write( s, 8, 0 );
- /* Allocate the subpicture internal data. */
- dvbsub->p_spu[j] = vout_CreateSubPicture( p_dec->p_vout,
- MEMORY_SUBPICTURE );
- if( dvbsub->p_spu[j] == NULL )
- {
- fprintf(stderr, "Unable to allocate memory ... skipping\n");
- return;
- }
- /* Set the pf_render callback */
- dvbsub->p_spu[j]->pf_render = dvbsub_RenderDVBSUB;
- dvbsub->p_spu[j]->p_sys = trox_malloc( sizeof( subpicture_sys_t ));
- dvbsub->p_spu[j]->p_sys->p_data = p_render;
- dvbsub->p_spu[j]->p_sys->b_obsolete=0;
- dvbsub->p_spu[j]->pf_destroy = dvbsub_Destroy;
- dvbsub->p_spu[j]->i_start = p_dec->bit_stream.p_pes->i_pts;
- dvbsub->p_spu[j]->i_stop = dvbsub->p_spu[j]->i_start + dvbsub->p_page->i_timeout*1000000;
- dvbsub->p_spu[j]->b_ephemer = VLC_FALSE;
-
- // At this stage, we have all we need in p_render
- // We need to free the object
- //Remove this object from the list
- p_object_old = p_object;
- if(p_object == dvbsub->p_objects)
- dvbsub->p_objects = p_object->p_next;
- else
- {
- for(p_o = dvbsub->p_objects; p_o->p_next != p_object; p_o=p_o->p_next);
- p_o->p_next = p_object->p_next;
+ if( !i_last_pixel )
+ {
+ bs_write( s, 1, 0 );
+ bs_write( s, 7, i_length ); /* pseudo color 0 */
+ }
+ else
+ {
+ bs_write( s, 1, 1 );
+ bs_write( s, 7, i_length );
+ bs_write( s, 8, i_last_pixel );
+ }
}
- free_object(p_object_old);
- vout_DisplaySubPicture (p_dec->p_vout, dvbsub->p_spu[j] );
- j++;
- }
+ if( i == p_region->fmt.i_visible_width ) break;
+
+ i_last_pixel = p_data[i];
+ i_length = 1;
}
+
+ /* Stop */
+ bs_write( s, 8, 0 );
+ bs_write( s, 8, 0 );
+
+ /* Stuffing */
+ bs_align_0( s );
}
projects / vlc / blobdiff