Standard MIDI File: don't abuse demux_vaControlHelper which is meant for sample-based...

[vlc] / modules / codec / rawvideo.c

diff --git a/modules/codec/rawvideo.c b/modules/codec/rawvideo.c
index 86c20a86ac9c7ede060cb611e1d8b5a91b2fca95..f842d35c10fb6d281d6b58ec1f7ffd98c7bf32b7 100644 (file)
--- a/modules/codec/rawvideo.c
+++ b/modules/codec/rawvideo.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * rawvideo.c: Pseudo video decoder/packetizer for raw video data
  *****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
+ * Copyright (C) 2001, 2002 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -18,15 +18,19 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
-#include <vlc/decoder.h>
-#include <vlc/vout.h>
+#include <vlc_codec.h>
+#include <vlc_vout.h>
 
 /*****************************************************************************
  * decoder_sys_t : raw video decoder descriptor
@@ -67,6 +71,8 @@ static block_t   *SendFrame  ( decoder_t *, block_t * );
 vlc_module_begin();
     set_description( _("Pseudo raw video decoder") );
     set_capability( "decoder", 50 );
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_VCODEC );
     set_callbacks( OpenDecoder, CloseDecoder );
 
     add_submodule();
@@ -94,10 +100,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'):
@@ -105,6 +115,14 @@ static int OpenDecoder( vlc_object_t *p_this )
         case VLC_FOURCC('R','V','1','6'):
         case VLC_FOURCC('R','V','1','5'):
             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'):
+            p_dec->fmt_in.i_codec = VLC_FOURCC('Y','V','1','2');
+            break;
 
         default:
             return VLC_EGENERIC;
@@ -251,16 +269,16 @@ static void FillPicture( decoder_t *p_dec, block_t *p_block, picture_t *p_pic )
     for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
     {
         p_dst = p_pic->p[i_plane].p_pixels;
-        i_width = p_pic->p[i_plane].i_visible_pitch;
+        i_width = p_pic->p[i_plane].i_pitch;
 
         if( p_sys->b_invert )
             p_src += (i_width * (p_pic->p[i_plane].i_visible_lines - 1));
 
         for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
         {
-            p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_width );
+            p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_width );
             p_src += p_sys->b_invert ? -i_width : i_width;
-            p_dst += p_pic->p[i_plane].i_pitch;
+            p_dst += i_width;
         }
 
         if( p_sys->b_invert )
@@ -318,22 +336,22 @@ static block_t *SendFrame( decoder_t *p_dec, block_t *p_block )
             return p_block;
         }
 
-        p_tmp = malloc( pic.p[0].i_visible_pitch );
+        p_tmp = malloc( pic.p[0].i_pitch );
         p_pixels = p_block->p_buffer;
         for( i = 0; i < pic.i_planes; i++ )
         {
-            int i_pitch = pic.p[i].i_visible_pitch;
+            int i_pitch = pic.p[i].i_pitch;
             uint8_t *p_top = p_pixels;
             uint8_t *p_bottom = p_pixels + i_pitch *
                 (pic.p[i].i_visible_lines - 1);
 
             for( j = 0; j < pic.p[i].i_visible_lines / 2; j++ )
             {
-                p_dec->p_vlc->pf_memcpy( p_tmp, p_bottom,
+                p_dec->p_libvlc->pf_memcpy( p_tmp, p_bottom,
                                          pic.p[i].i_visible_pitch  );
-                p_dec->p_vlc->pf_memcpy( p_bottom, p_top,
+                p_dec->p_libvlc->pf_memcpy( p_bottom, p_top,
                                          pic.p[i].i_visible_pitch  );
-                p_dec->p_vlc->pf_memcpy( p_top, p_tmp,
+                p_dec->p_libvlc->pf_memcpy( p_top, p_tmp,
                                          pic.p[i].i_visible_pitch  );
                 p_top += i_pitch;
                 p_bottom -= i_pitch;