Include vlc_plugin.h as needed

[vlc] / modules / codec / zvbi.c

diff --git a/modules/codec/zvbi.c b/modules/codec/zvbi.c
index 1e7740e719fa4b5ea71fa5ad2c60e18d42b80136..0cb60681ec58421bc91308f5637f4ed7b7c6ae8f 100644 (file)
--- a/modules/codec/zvbi.c
+++ b/modules/codec/zvbi.c
@@ -42,6 +42,7 @@
 #endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <assert.h>
 #include <stdint.h>
 #include <libzvbi.h>
@@ -93,6 +94,8 @@ static subpicture_t *Decode( decoder_t *, block_t ** );
 #define TELX_LONGTEXT N_( "Output teletext subtitles as text " \
   "instead of as RGBA" )
 
+// #define ZVBI_DEBUG
+
 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"),
@@ -122,10 +125,10 @@ vlc_module_end();
 
 struct decoder_sys_t
 {
-    vbi_decoder *           p_vbi_dec;
-    vbi_dvb_demux *         p_dvb_demux;
-    unsigned int            i_wanted_page;
-    unsigned int            i_last_page;
+    vbi_decoder *     p_vbi_dec;
+    vbi_dvb_demux *   p_dvb_demux;
+    unsigned int      i_wanted_page;
+    unsigned int      i_last_page;
     bool              b_update;
     bool              b_opaque;
 
@@ -133,11 +136,11 @@ struct decoder_sys_t
     bool              b_text;
 
     /* Positioning of Teletext images */
-    int                     i_align;
+    int               i_align;
 
     /* Misc */
 #if defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
-    image_handler_t         *p_image;
+    image_handler_t   *p_image;
 #endif
 };
 
@@ -168,17 +171,12 @@ static int Open( vlc_object_t *p_this )
     decoder_sys_t *p_sys = NULL;
 
     if( p_dec->fmt_in.i_codec != VLC_FOURCC('t','e','l','x') )
-    {
         return VLC_EGENERIC;
-    }
 
     p_dec->pf_decode_sub = Decode;
     p_sys = p_dec->p_sys = malloc( sizeof(decoder_sys_t) );
     if( p_sys == NULL )
-    {
-        msg_Err( p_dec, "out of memory" );
         return VLC_ENOMEM;
-    }
     memset( p_sys, 0, sizeof(decoder_sys_t) );
 
 #if defined(HAVE_FFMPEG_SWSCALE_H) || defined(HAVE_LIBSWSCALE_SWSCALE_H) || defined(HAVE_LIBSWSCALE_TREE)
@@ -186,7 +184,6 @@ static int Open( vlc_object_t *p_this )
     if( !p_sys->p_image )
     {
         free( p_sys );
-        msg_Err( p_dec, "out of memory" );
         return VLC_ENOMEM;
     }
 #endif
@@ -265,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;
@@ -307,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
@@ -379,7 +376,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->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
     {
@@ -415,7 +414,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 );
@@ -477,18 +476,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 );