Skip to content

V
vlc-gpu
Commit 891afb44 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files
Options

Put extra debugging behind ifdef ZVBI_DEBUG.

parent d6e9d55a
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 7 deletions
modules/codec/zvbi.c
View file @ 891afb44
...@@ -93,6 +93,8 @@ static subpicture_t *Decode( decoder_t *, block_t ** ); ...@@ -93,6 +93,8 @@ static subpicture_t *Decode( decoder_t *, block_t ** );
#define TELX_LONGTEXT N_( "Output teletext subtitles as text " \ #define TELX_LONGTEXT N_( "Output teletext subtitles as text " \
"instead of as RGBA" ) "instead of as RGBA" )
// #define ZVBI_DEBUG
static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
static const char *ppsz_pos_descriptions[] = static const char *ppsz_pos_descriptions[] =
{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"), { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
...@@ -301,7 +303,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block ) ...@@ -301,7 +303,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
p_sys->b_update = false; p_sys->b_update = false;
p_sys->i_last_page = p_sys->i_wanted_page; p_sys->i_last_page = p_sys->i_wanted_page;
#if 1 #ifdef ZVBI_DEBUG
msg_Dbg( p_dec, "we now have page: %d ready for display", msg_Dbg( p_dec, "we now have page: %d ready for display",
p_sys->i_wanted_page ); p_sys->i_wanted_page );
#endif #endif
...@@ -373,7 +375,9 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block ) ...@@ -373,7 +375,9 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
p_spu->p_region->psz_text = strdup( &p_text[8] ); p_spu->p_region->psz_text = strdup( &p_text[8] );
p_spu->p_region->fmt.i_height = p_spu->p_region->fmt.i_visible_height = p_page.rows + 1; p_spu->p_region->fmt.i_height = p_spu->p_region->fmt.i_visible_height = p_page.rows + 1;
#ifdef ZVBI_DEBUG
msg_Info( p_dec, "page %x-%x(%d)\n%s", p_page.pgno, p_page.subno, i_total, p_text ); msg_Info( p_dec, "page %x-%x(%d)\n%s", p_page.pgno, p_page.subno, i_total, p_text );
#endif
} }
else else
{ {
...@@ -409,7 +413,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block ) ...@@ -409,7 +413,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
p_pic->p->i_lines = p_page.rows * 10; p_pic->p->i_lines = p_page.rows * 10;
p_pic->p->i_pitch = p_page.columns * 12 * 4; p_pic->p->i_pitch = p_page.columns * 12 * 4;
#if 1 #ifdef ZVBI_DEBUG
msg_Dbg( p_dec, "page %x-%x(%d,%d)", msg_Dbg( p_dec, "page %x-%x(%d,%d)",
p_page.pgno, p_page.subno, p_page.pgno, p_page.subno,
p_page.rows, p_page.columns ); p_page.rows, p_page.columns );
...@@ -471,18 +475,20 @@ static void event_handler( vbi_event *ev, void *user_data ) ...@@ -471,18 +475,20 @@ static void event_handler( vbi_event *ev, void *user_data )
if( ev->type == VBI_EVENT_TTX_PAGE ) if( ev->type == VBI_EVENT_TTX_PAGE )
{ {
/* msg_Info( p_dec, "Page %03x.%02x ", #ifdef ZVBI_DEBUG
msg_Info( p_dec, "Page %03x.%02x ",
ev->ev.ttx_page.pgno, ev->ev.ttx_page.pgno,
ev->ev.ttx_page.subno & 0xFF); ev->ev.ttx_page.subno & 0xFF);
*/ #endif
if( p_sys->i_last_page == vbi_bcd2dec( ev->ev.ttx_page.pgno ) ) if( p_sys->i_last_page == vbi_bcd2dec( ev->ev.ttx_page.pgno ) )
p_sys->b_update = true; p_sys->b_update = true;
if( ev->ev.ttx_page.clock_update ) if( ev->ev.ttx_page.clock_update )
msg_Dbg( p_dec, "clock" ); msg_Dbg( p_dec, "clock" );
/* if( ev->ev.ttx_page.header_update ) #ifdef ZVBI_DEBUG
if( ev->ev.ttx_page.header_update )
msg_Dbg( p_dec, "header" ); msg_Dbg( p_dec, "header" );
*/ #endif
} }
else if( ev->type == VBI_EVENT_CAPTION ) else if( ev->type == VBI_EVENT_CAPTION )
msg_Dbg( p_dec, "Caption line: %x", ev->ev.caption.pgno ); msg_Dbg( p_dec, "Caption line: %x", ev->ev.caption.pgno );
......
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