Fix description

[vlc] / modules / codec / zvbi.c

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 0e1b70827a8fb9e60e2c272be359d5eb82f9199b..dce7fea0aa5e53884f63f44c1dfbeca3ac510a3e 100644 (file)
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -41,7 +41,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <assert.h>
 #include <stdint.h>
 #include <libzvbi.h>
@@ -93,14 +94,16 @@ static subpicture_t *Decode( decoder_t *, block_t ** );
 #define TELX_LONGTEXT N_( "Output teletext subtitles as text " \
   "instead of as RGBA" )
 
-static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static const char *ppsz_pos_descriptions[] =
+// #define ZVBI_DEBUG
+
+static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *const 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") };
 
 vlc_module_begin();
-    set_description( _("VBI and Teletext decoder") );
-    set_shortname( "VBI & Teletext" );
+    set_description( N_("VBI and Teletext decoder") );
+    set_shortname( N_("VBI & Teletext") );
     set_capability( "decoder", 51 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_SCODEC );
@@ -259,7 +262,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
     block_t         *p_block;
     subpicture_t    *p_spu = NULL;
     video_format_t  fmt;
-    bool      b_cached = false;
+    bool            b_cached = false;
     vbi_page        p_page;
     const uint8_t   *p_pos;
     unsigned int    i_left;
@@ -301,7 +304,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
 
     p_sys->b_update = false;
     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",
               p_sys->i_wanted_page );
 #endif
@@ -323,9 +326,12 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
                                    VLC_FOURCC('R','G','B','A');
 #endif
     fmt.i_aspect = p_sys->b_text ? 0 : VOUT_ASPECT_FACTOR;
-    fmt.i_sar_num = fmt.i_sar_den = 1;
-    fmt.i_width = fmt.i_visible_width = p_page.columns * 12;
-    fmt.i_height = fmt.i_visible_height = p_page.rows * 10;
+    if( !p_sys->b_text )
+    {
+        fmt.i_sar_num = fmt.i_sar_den = 1;
+        fmt.i_width = fmt.i_visible_width = p_page.columns * 12;
+        fmt.i_height = fmt.i_visible_height = p_page.rows * 10;
+    }
     fmt.i_bits_per_pixel = p_sys->b_text ? 0 : 32;
     fmt.i_x_offset = fmt.i_y_offset = 0;
 
@@ -338,20 +344,23 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
 
     p_spu->p_region->i_x = 0;
     p_spu->p_region->i_y = 0;
-    p_spu->p_region->i_align = SUBPICTURE_ALIGN_BOTTOM;
+    p_spu->p_region->i_align = p_sys->i_align;
 
     /* Normal text subs, easy markup */
     p_spu->i_flags = SUBPICTURE_ALIGN_BOTTOM;
 
-    p_spu->i_start = (mtime_t) p_block->i_dts;
+    p_spu->i_start = (mtime_t) p_block->i_pts;
     p_spu->i_stop = (mtime_t) 0;
     p_spu->b_ephemer = true;
     p_spu->b_absolute = false;
     p_spu->b_pausable = true;
-    p_spu->i_width = fmt.i_width;
-    p_spu->i_height = fmt.i_height;
-    p_spu->i_original_picture_width = p_page.columns * 12;
-    p_spu->i_original_picture_height = p_page.rows * 10;
+    if( !p_sys->b_text )
+    {
+        p_spu->i_width = fmt.i_width;
+        p_spu->i_height = fmt.i_height;
+        p_spu->i_original_picture_width = p_page.columns * 12;
+        p_spu->i_original_picture_height = p_page.rows * 10;
+    }
 
 #ifdef WORDS_BIGENDIAN
 # define ZVBI_PIXFMT_RGBA32 VBI_PIXFMT_RGBA32_BE
@@ -372,8 +381,9 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
         if( i_total <= 40 ) goto error;
         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;
+#ifdef ZVBI_DEBUG
         msg_Info( p_dec, "page %x-%x(%d)\n%s", p_page.pgno, p_page.subno, i_total, p_text );
+#endif
     }
     else
     {
@@ -383,10 +393,7 @@ static subpicture_t *Decode( decoder_t *p_dec, block_t **pp_block )
 
         p_pic = ( picture_t * ) malloc( sizeof( picture_t ) );
         if( !p_pic )
-        {
-            msg_Err( p_dec, "out of memory" );
             goto error;
-        }
 
         memset( &fmt_in, 0, sizeof( video_format_t ) );
         memset( p_pic, 0, sizeof( picture_t ) );
@@ -409,7 +416,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_pitch = p_page.columns * 12 * 4;
 
-#if 1
+#ifdef ZVBI_DEBUG
         msg_Dbg( p_dec, "page %x-%x(%d,%d)",
                  p_page.pgno, p_page.subno,
                  p_page.rows, p_page.columns );
@@ -471,18 +478,20 @@ static void event_handler( vbi_event *ev, void *user_data )
 
     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.subno & 0xFF);
-        */
+#endif
         if( p_sys->i_last_page == vbi_bcd2dec( ev->ev.ttx_page.pgno ) )
             p_sys->b_update = true;
 
         if( ev->ev.ttx_page.clock_update )
             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" );
-*/
+#endif
     }
     else if( ev->type == VBI_EVENT_CAPTION )
         msg_Dbg( p_dec, "Caption line: %x", ev->ev.caption.pgno );