* modules/demux/rawvid.c: raw video demuxer (only does YV12 for now).

configure.ac

@@ -1148,7 +1148,7 @@ dnl
 dnl  default modules
 dnl
 VLC_ADD_PLUGINS([dummy logger memcpy])
-VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 ps pva avi asf mp4 rawdv nsv real aiff mjpeg demuxdump flacsys tta])
+VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta])
 VLC_ADD_PLUGINS([cvdsub svcdsub spudec telx subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flac])
 VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise extract sharpen])
 VLC_ADD_PLUGINS([converter_fixed mono])

modules/demux/Modules.am

@@ -4,6 +4,7 @@ SOURCES_flacsys = flac.c
 SOURCES_ogg = ogg.c
 SOURCES_demuxdump = demuxdump.c
 SOURCES_rawdv = rawdv.c
+SOURCES_rawvid = rawvid.c
 SOURCES_au = au.c
 SOURCES_wav = wav.c
 SOURCES_mkv = mkv.cpp mp4/libmp4.c mp4/drms.c

modules/demux/rawvid.c

+/*****************************************************************************
+ * rawvid.c : raw video input module for vlc
+ *****************************************************************************
+ * Copyright (C) 2007 the VideoLAN team
+ * $Id: rawdv.c 18062 2006-11-26 14:20:34Z zorglub $
+ *
+ * Authors: Gildas Bazin <gbazin@videolan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <stdlib.h>                                      /* malloc(), free() */
+
+#include <vlc/vlc.h>
+#include <vlc_demux.h>
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+static int  Open ( vlc_object_t * );
+static void Close( vlc_object_t * );
+
+#define FPS_TEXT N_("Frames per Second")
+#define FPS_LONGTEXT N_("This is the desired frame rate when " \
+    "playing raw video streams.")
+
+#define WIDTH_TEXT N_("Width")
+#define WIDTH_LONGTEXT N_("This specifies the width in pixels of the raw " \
+    "video stream.")
+
+#define HEIGHT_TEXT N_("Height")
+#define HEIGHT_LONGTEXT N_("This specifies the height in pixels of the raw " \
+    "video stream.")
+
+vlc_module_begin();
+    set_shortname( "Raw Video" );
+    set_description( _("Raw video demuxer") );
+    set_capability( "demux2", 2 );
+    set_category( CAT_INPUT );
+    set_subcategory( SUBCAT_INPUT_DEMUX );
+    set_callbacks( Open, Close );
+    add_shortcut( "rawvideo" );
+    add_float( "rawvid-fps", 25, 0, FPS_TEXT, FPS_LONGTEXT, VLC_FALSE );
+    add_integer( "rawvid-width", 176, 0, WIDTH_TEXT, WIDTH_LONGTEXT, 0 );
+    add_integer( "rawvid-height", 144, 0, HEIGHT_TEXT, HEIGHT_LONGTEXT, 0 );
+vlc_module_end();
+
+/*****************************************************************************
+ * Definitions of structures used by this plugin
+ *****************************************************************************/
+struct demux_sys_t
+{
+    int    frame_size;
+    float  f_fps;
+
+    es_out_id_t *p_es_video;
+    es_format_t  fmt_video;
+
+    mtime_t i_pcr;
+};
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int Demux( demux_t * );
+static int Control( demux_t *, int i_query, va_list args );
+
+/*****************************************************************************
+ * Open: initializes raw DV demux structures
+ *****************************************************************************/
+static int Open( vlc_object_t * p_this )
+{
+    demux_t     *p_demux = (demux_t*)p_this;
+    demux_sys_t *p_sys;
+    int i_width, i_height;
+    vlc_value_t val;
+    char *psz_ext;
+
+    /* Check for YUV file extension */
+    psz_ext = strrchr( p_demux->psz_path, '.' );
+    if( ( !psz_ext || strcasecmp( psz_ext, ".yuv") ) &&
+        strcmp(p_demux->psz_demux, "rawvid") )
+    {
+        return VLC_EGENERIC;
+    }
+
+    /* Set p_input field */
+    p_demux->pf_demux   = Demux;
+    p_demux->pf_control = Control;
+    p_demux->p_sys      = p_sys = malloc( sizeof( demux_sys_t ) );
+    p_sys->i_pcr = 1;
+
+    var_Create( p_demux, "rawvid-fps", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "rawvid-fps", &val );
+    p_sys->f_fps = val.f_float;
+    var_Create( p_demux, "rawvid-width", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
+    var_Get( p_demux, "rawvid-width", &val );
+    i_width = val.i_int;
+    var_Create( p_demux, "rawvid-height", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT);
+    var_Get( p_demux, "rawvid-height", &val );
+    i_height = val.i_int;
+
+    /* Only handle YV12 for now */
+    es_format_Init( &p_sys->fmt_video, VIDEO_ES, VLC_FOURCC('Y','V','1','2') );
+    p_sys->fmt_video.video.i_width  = i_width;
+    p_sys->fmt_video.video.i_height = i_height;
+    p_sys->frame_size = i_width * i_height * 3 / 2;
+    p_sys->p_es_video = es_out_Add( p_demux->out, &p_sys->fmt_video );
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Close: frees unused data
+ *****************************************************************************/
+static void Close( vlc_object_t *p_this )
+{
+    demux_t     *p_demux = (demux_t*)p_this;
+    demux_sys_t *p_sys  = p_demux->p_sys;
+    free( p_sys );
+}
+
+/*****************************************************************************
+ * Demux: reads and demuxes data packets
+ *****************************************************************************
+ * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
+ *****************************************************************************/
+static int Demux( demux_t *p_demux )
+{
+    demux_sys_t *p_sys  = p_demux->p_sys;
+    block_t     *p_block;
+
+    /* Call the pace control */
+    es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr );
+
+    if( ( p_block = stream_Block( p_demux->s, p_sys->frame_size ) ) == NULL )
+    {
+        /* EOF */
+        return 0;
+    }
+
+    p_block->i_dts = p_block->i_pts = p_sys->i_pcr;
+    es_out_Send( p_demux->out, p_sys->p_es_video, p_block );
+
+    p_sys->i_pcr += ( I64C(1000000) / p_sys->f_fps );
+
+    return 1;
+}
+
+/*****************************************************************************
+ * Control:
+ *****************************************************************************/
+static int Control( demux_t *p_demux, int i_query, va_list args )
+{
+    demux_sys_t *p_sys  = p_demux->p_sys;
+
+    /* XXX: DEMUX_SET_TIME is precise here */
+    return demux2_vaControlHelper( p_demux->s, 0, -1,
+                                   p_sys->frame_size * p_sys->f_fps * 8,
+                                   p_sys->frame_size, i_query, args );
+}