Include vlc_plugin.h as needed

[vlc] / modules / codec / rawvideo.c

diff --git a/modules/codec/rawvideo.c b/modules/codec/rawvideo.c
index 41d1c32524a7382b0135550d5c9e5452f769dddf..fa4add7a005d3b6ca4850c40dd021f7717aabdaa 100644 (file)
--- a/modules/codec/rawvideo.c
+++ b/modules/codec/rawvideo.c
@@ -24,7 +24,12 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_vout.h>
 
@@ -34,13 +39,13 @@
 struct decoder_sys_t
 {
     /* Module mode */
-    vlc_bool_t b_packetizer;
+    bool b_packetizer;
 
     /*
      * Input properties
      */
-    int i_raw_size;
-    vlc_bool_t b_invert;
+    size_t i_raw_size;
+    bool b_invert;
 
     /*
      * Common properties
@@ -96,10 +101,14 @@ static int OpenDecoder( vlc_object_t *p_this )
         case VLC_FOURCC('I','4','1','1'):
         case VLC_FOURCC('I','4','1','0'):
         case VLC_FOURCC('Y','V','U','9'):
+        case VLC_FOURCC('Y','4','2','B'):
+        case VLC_FOURCC('Y','4','1','B'):
 
         /* Packed YUV */
         case VLC_FOURCC('Y','U','Y','2'):
+        case VLC_FOURCC('Y','8','0','0'):
         case VLC_FOURCC('U','Y','V','Y'):
+        case VLC_FOURCC('H','D','Y','C'):
 
         /* RGB */
         case VLC_FOURCC('R','V','3','2'):
@@ -109,6 +118,7 @@ static int OpenDecoder( vlc_object_t *p_this )
             break;
         case VLC_FOURCC('2','V','u','y'):
         case VLC_FOURCC('2','v','u','y'):
+        case VLC_FOURCC('A','V','U','I'):
             p_dec->fmt_in.i_codec = VLC_FOURCC('U','Y','V','Y');
             break;
         case VLC_FOURCC('y','v','1','2'):
@@ -127,7 +137,7 @@ static int OpenDecoder( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
     /* Misc init */
-    p_dec->p_sys->b_packetizer = VLC_FALSE;
+    p_dec->p_sys->b_packetizer = false;
     p_sys->i_pts = 0;
     p_sys->b_invert = 0;
 
@@ -136,7 +146,7 @@ static int OpenDecoder( vlc_object_t *p_this )
         /* Frames are coded from bottom to top */
         p_dec->fmt_in.video.i_height =
             (unsigned int)(-(int)p_dec->fmt_in.video.i_height);
-        p_sys->b_invert = VLC_TRUE;
+        p_sys->b_invert = true;
     }
 
     if( p_dec->fmt_in.video.i_width <= 0 || p_dec->fmt_in.video.i_height <= 0 )
@@ -186,7 +196,7 @@ static int OpenPacketizer( vlc_object_t *p_this )
 
     int i_ret = OpenDecoder( p_this );
 
-    if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = VLC_TRUE;
+    if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = true;
 
     return i_ret;
 }
@@ -239,7 +249,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
     }
 
     /* Date management: 1 frame per packet */
-    p_sys->i_pts += ( I64C(1000000) * 1.0 / 25 /*FIXME*/ );
+    p_sys->i_pts += ( INT64_C(1000000) * 1.0 / 25 /*FIXME*/ );
     *pp_block = NULL;
 
     return p_buf;
@@ -267,7 +277,7 @@ static void FillPicture( decoder_t *p_dec, block_t *p_block, picture_t *p_pic )
 
         for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
         {
-            p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_width );
+            vlc_memcpy( p_dst, p_src, i_width );
             p_src += p_sys->b_invert ? -i_width : i_width;
             p_dst += i_width;
         }
@@ -338,12 +348,9 @@ static block_t *SendFrame( decoder_t *p_dec, block_t *p_block )
 
             for( j = 0; j < pic.p[i].i_visible_lines / 2; j++ )
             {
-                p_dec->p_libvlc->pf_memcpy( p_tmp, p_bottom,
-                                         pic.p[i].i_visible_pitch  );
-                p_dec->p_libvlc->pf_memcpy( p_bottom, p_top,
-                                         pic.p[i].i_visible_pitch  );
-                p_dec->p_libvlc->pf_memcpy( p_top, p_tmp,
-                                         pic.p[i].i_visible_pitch  );
+                vlc_memcpy( p_tmp, p_bottom, pic.p[i].i_visible_pitch  );
+                vlc_memcpy( p_bottom, p_top, pic.p[i].i_visible_pitch  );
+                vlc_memcpy( p_top, p_tmp, pic.p[i].i_visible_pitch  );
                 p_top += i_pitch;
                 p_bottom -= i_pitch;
             }