Commit a108f3ff authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

SVCD: remove the useless debug option and associated text

Seriously, this is WTF-code
parent dd5856db
...@@ -43,13 +43,6 @@ static int DecoderOpen ( vlc_object_t * ); ...@@ -43,13 +43,6 @@ static int DecoderOpen ( vlc_object_t * );
static int PacketizerOpen( vlc_object_t * ); static int PacketizerOpen( vlc_object_t * );
static void DecoderClose ( vlc_object_t * ); static void DecoderClose ( vlc_object_t * );
#define DEBUG_TEXT N_("Enable debug")
#define DEBUG_LONGTEXT \
N_("This integer when viewed in binary is a debugging mask\n" \
"calls 1\n" \
"packet assembly info 2\n" )
vlc_module_begin () vlc_module_begin ()
set_description( N_("Philips OGT (SVCD subtitle) decoder") ) set_description( N_("Philips OGT (SVCD subtitle) decoder") )
set_shortname( N_("SVCD subtitles") ) set_shortname( N_("SVCD subtitles") )
...@@ -58,8 +51,7 @@ vlc_module_begin () ...@@ -58,8 +51,7 @@ vlc_module_begin ()
set_capability( "decoder", 50 ) set_capability( "decoder", 50 )
set_callbacks( DecoderOpen, DecoderClose ) set_callbacks( DecoderOpen, DecoderClose )
add_integer ( MODULE_STRING "-debug", 0, add_obsolete_integer ( MODULE_STRING "-debug" )
DEBUG_TEXT, DEBUG_LONGTEXT, true )
add_submodule () add_submodule ()
set_description( N_("Philips OGT (SVCD subtitle) packetizer") ) set_description( N_("Philips OGT (SVCD subtitle) packetizer") )
...@@ -77,9 +69,6 @@ static void ParseHeader( decoder_t *, block_t * ); ...@@ -77,9 +69,6 @@ static void ParseHeader( decoder_t *, block_t * );
static subpicture_t *DecodePacket( decoder_t *, block_t * ); static subpicture_t *DecodePacket( decoder_t *, block_t * );
static void SVCDSubRenderImage( decoder_t *, block_t *, subpicture_region_t * ); static void SVCDSubRenderImage( decoder_t *, block_t *, subpicture_region_t * );
#define DECODE_DBG_CALL 1 /* calls */
#define DECODE_DBG_PACKET 2 /* packet assembly info */
#define GETINT16(p) ( (p[0] << 8) + p[1] ) ; p +=2; #define GETINT16(p) ( (p[0] << 8) + p[1] ) ; p +=2;
#define GETINT32(p) ( (p[0] << 24) + (p[1] << 16) + \ #define GETINT32(p) ( (p[0] << 24) + (p[1] << 16) + \
...@@ -91,21 +80,15 @@ typedef enum { ...@@ -91,21 +80,15 @@ typedef enum {
SUBTITLE_BLOCK_COMPLETE = 2 SUBTITLE_BLOCK_COMPLETE = 2
} packet_state_t; } packet_state_t;
#ifndef DECODE_DEBUG #ifndef NDEBUG
#define DECODE_DEBUG 1 # define dbg_print( s, args...) \
#endif
#if DECODE_DEBUG
#define dbg_print(mask, s, args...) \
if (p_sys && p_sys->i_debug & mask) \
msg_Dbg(p_dec, "%s: "s, __func__ , ##args) msg_Dbg(p_dec, "%s: "s, __func__ , ##args)
#else #else
#define dbg_print(mask, s, args...) # define dbg_print( s, args...)
#endif #endif
struct decoder_sys_t struct decoder_sys_t
{ {
int i_debug; /* debugging mask */
packet_state_t i_state; /* data-gathering state for this subtitle */ packet_state_t i_state; /* data-gathering state for this subtitle */
block_t *p_spu; /* Bytes of the packet. */ block_t *p_spu; /* Bytes of the packet. */
...@@ -148,7 +131,6 @@ static int DecoderOpen( vlc_object_t *p_this ) ...@@ -148,7 +131,6 @@ static int DecoderOpen( vlc_object_t *p_this )
if( p_sys == NULL ) if( p_sys == NULL )
return VLC_ENOMEM; return VLC_ENOMEM;
p_sys->i_debug = var_InheritInteger( p_this, MODULE_STRING "-debug" );
p_sys->i_image = -1; p_sys->i_image = -1;
...@@ -160,7 +142,6 @@ static int DecoderOpen( vlc_object_t *p_this ) ...@@ -160,7 +142,6 @@ static int DecoderOpen( vlc_object_t *p_this )
p_dec->pf_decode_sub = Decode; p_dec->pf_decode_sub = Decode;
p_dec->pf_packetize = Packetize; p_dec->pf_packetize = Packetize;
dbg_print( (DECODE_DBG_CALL) , "");
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -192,9 +173,8 @@ void DecoderClose( vlc_object_t *p_this ) ...@@ -192,9 +173,8 @@ void DecoderClose( vlc_object_t *p_this )
static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block ) static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
{ {
block_t *p_block, *p_spu; block_t *p_block, *p_spu;
decoder_sys_t *p_sys = p_dec->p_sys;
dbg_print( (DECODE_DBG_CALL) , ""); dbg_print( "" );
if( pp_block == NULL || *pp_block == NULL ) return NULL; if( pp_block == NULL || *pp_block == NULL ) return NULL;
...@@ -334,8 +314,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block ) ...@@ -334,8 +314,7 @@ static block_t *Reassemble( decoder_t *p_dec, block_t *p_block )
p_spu->i_buffer, p_sys->i_spu_size ); p_spu->i_buffer, p_sys->i_spu_size );
} }
dbg_print( (DECODE_DBG_PACKET), dbg_print( "subtitle packet complete, size=%zu", p_spu->i_buffer );
"subtitle packet complete, size=%zu", p_spu->i_buffer );
p_sys->i_state = SUBTITLE_BLOCK_EMPTY; p_sys->i_state = SUBTITLE_BLOCK_EMPTY;
p_sys->p_spu = 0; p_sys->p_spu = 0;
...@@ -414,7 +393,7 @@ static void ParseHeader( decoder_t *p_dec, block_t *p_block ) ...@@ -414,7 +393,7 @@ static void ParseHeader( decoder_t *p_dec, block_t *p_block )
p_sys->i_image_length = p_sys->i_spu_size - p_sys->i_image_offset; p_sys->i_image_length = p_sys->i_spu_size - p_sys->i_image_offset;
p_sys->metadata_length = p_sys->i_image_offset; p_sys->metadata_length = p_sys->i_image_offset;
if( p_sys->i_debug & DECODE_DBG_PACKET ) #ifndef NDEBUG
{ {
msg_Dbg( p_dec, "x-start: %d, y-start: %d, width: %d, height %d, " msg_Dbg( p_dec, "x-start: %d, y-start: %d, width: %d, height %d, "
"spu size: %zu, duration: %"PRIu64" (d:%zu p:%"PRIu16")", "spu size: %zu, duration: %"PRIu64" (d:%zu p:%"PRIu16")",
...@@ -430,6 +409,7 @@ static void ParseHeader( decoder_t *p_dec, block_t *p_block ) ...@@ -430,6 +409,7 @@ static void ParseHeader( decoder_t *p_dec, block_t *p_block )
p_sys->p_palette[i][1], p_sys->p_palette[i][2] ); p_sys->p_palette[i][1], p_sys->p_palette[i][2] );
} }
} }
#endif
} }
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment