libvlccore: fix AUTO_ADJUST_PTS_DELAY short comment.

[vlc] / modules / video_output / fb.c

diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 787cb89f787e265e901f46d524284ff16b96f88e..95ea2fe1a317b5df5284080e885488a52eb07b65 100644 (file)
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -25,6 +25,11 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <errno.h>                                                 /* ENOMEM */
 #include <signal.h>                                      /* SIGUSR1, SIGUSR2 */
 #include <fcntl.h>                                                 /* open() */
@@ -38,11 +43,8 @@
 #include <linux/vt.h>                                                /* VT_* */
 #include <linux/kd.h>                                                 /* KD* */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 /*****************************************************************************
@@ -116,7 +118,7 @@ vlc_module_begin();
                  true );
     add_bool( "fb-hw-accel", true, NULL, HW_ACCEL_TEXT, HW_ACCEL_LONGTEXT,
               true );
-    set_description( _("GNU/Linux console framebuffer video output") );
+    set_description( N_("GNU/Linux console framebuffer video output") );
     set_capability( "video output", 30 );
     set_callbacks( Create, Destroy );
 vlc_module_end();
@@ -131,7 +133,7 @@ struct vout_sys_t
 {
     /* System information */
     int                 i_tty;                          /* tty device handle */
-    bool          b_tty;
+    bool                b_tty;
     struct termios      old_termios;
 
     /* Original configuration information */
@@ -143,27 +145,27 @@ struct vout_sys_t
     int                         i_fd;                       /* device handle */
     struct fb_var_screeninfo    old_info;       /* original mode information */
     struct fb_var_screeninfo    var_info;        /* current mode information */
-    bool                  b_pan;     /* does device supports panning ? */
+    bool                        b_pan;     /* does device supports panning ? */
     struct fb_cmap              fb_cmap;                /* original colormap */
     uint16_t                    *p_palette;              /* original palette */
-    bool                  b_hw_accel;          /* has hardware support */
+    bool                        b_hw_accel;          /* has hardware support */
 
     /* Video information */
     uint32_t i_width;
     uint32_t i_height;
-    int i_aspect;
-    int i_bytes_per_pixel;
-    bool   b_auto;       /* Automatically adjust video size to fb size */
+    int      i_aspect;
+    int      i_bytes_per_pixel;
+    bool     b_auto;       /* Automatically adjust video size to fb size */
     vlc_fourcc_t i_chroma;
 
     /* Video memory */
-    byte_t *    p_video;                                      /* base adress */
+    uint8_t    *p_video;                                      /* base adress */
     size_t      i_page_size;                                    /* page size */
 };
 
 struct picture_sys_t
 {
-    byte_t *    p_data;                                       /* base adress */
+    uint8_t *    p_data;                                      /* base adress */
 };
 
 /*****************************************************************************
@@ -185,10 +187,7 @@ static int Create( vlc_object_t *p_this )
     /* Allocate instance and initialize some members */
     p_vout->p_sys = p_sys = malloc( sizeof( vout_sys_t ) );
     if( p_vout->p_sys == NULL )
-    {
-        msg_Err( p_vout, "out of memory" );
         return VLC_ENOMEM;
-    };
     memset( p_sys, 0, sizeof(vout_sys_t) );
 
     p_vout->pf_init = Init;
@@ -526,13 +525,12 @@ static int Init( vout_thread_t *p_vout )
     }
     p_vout->fmt_out.i_chroma = p_vout->output.i_chroma;
 
-    if( !p_sys->b_auto )
-    {
-        p_vout->render.i_width = p_sys->i_width;
-        p_vout->render.i_height = p_sys->i_height;
-    }
-    p_vout->output.i_width  = p_vout->fmt_out.i_width = p_sys->i_width;
-    p_vout->output.i_height = p_vout->fmt_out.i_height = p_sys->i_height;
+    p_vout->output.i_width =
+    p_vout->fmt_out.i_width =
+    p_vout->fmt_out.i_visible_width = p_sys->i_width;
+    p_vout->output.i_height =
+    p_vout->fmt_out.i_height =
+    p_vout->fmt_out.i_visible_height = p_sys->i_height;
 
     /* Assume we have square pixels */
     if( p_sys->i_aspect < 0 )
@@ -751,8 +749,8 @@ static int panned=0;
 
     if( !p_vout->p_sys->b_hw_accel )
     {
-        p_vout->p_libvlc->pf_memcpy( p_vout->p_sys->p_video, p_pic->p->p_pixels,
-                                     p_vout->p_sys->i_page_size );
+        vlc_memcpy( p_vout->p_sys->p_video, p_pic->p->p_pixels,
+                    p_vout->p_sys->i_page_size );
     }
 }
 
@@ -873,8 +871,6 @@ static int OpenDisplay( vout_thread_t *p_vout )
         p_sys->p_palette = malloc( 8 * 256 * sizeof( uint16_t ) );
         if( !p_sys->p_palette )
         {
-            msg_Err( p_vout, "out of memory" );
-
             /* Restore fb config */
             ioctl( p_sys->i_fd, FBIOPUT_VSCREENINFO, &p_sys->old_info );