Added a special access module for PVR MPEG-2 encoding boards.

 It allows to change the frequency and such things quite easily, from VLC.
 You'll have to --enable-pvr to build it.

configure.ac.in

@@ -1331,6 +1331,16 @@ then
    ],[])
 fi
 
+dnl
+dnl  special access module for Hauppauge PVR cards
+dnl
+AC_ARG_ENABLE(pvr,
+  [  --enable-pvr            PVR cards access module (default disabled)])
+if test "x${enable_pvr}" = "xyes"
+then
+  PLUGINS="${PLUGINS} pvr"
+fi
+
 dnl
 dnl  VCD module
 dnl

modules/Makefile.am

@@ -7,6 +7,7 @@ EXTRA_DIST = \
 	access/dvdplay/Modules.am \
 	access/dvdread/Modules.am \
 	access/mms/Modules.am \
+	access/pvr/Modules.am \
 	access/satellite/Modules.am \
 	access/v4l/Modules.am \
 	access/vcd/Modules.am \

modules/access/pvr/Modules.am

+SOURCES_pvr = modules/access/pvr/pvr.c \
+	modules/access/pvr/videodev2.h

modules/access/pvr/pvr.c

+/*****************************************************************************
+ * pvr.c
+ *****************************************************************************
+ * Copyright (C) 2001, 2002 VideoLAN
+ * $Id: pvr.c,v 1.1 2003/06/04 21:41:47 titer Exp $
+ *
+ * Authors: Eric Petit <titer@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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include <vlc/vlc.h>
+#include <vlc/input.h>
+
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <linux/types.h>
+#include <sys/ioctl.h>
+#include "videodev2.h"
+
+/* ivtv specific ioctls */
+#define IVTV_IOC_G_CODEC    0xFFEE7703
+#define IVTV_IOC_S_CODEC    0xFFEE7704
+
+/* for use with IVTV_IOC_G_CODEC and IVTV_IOC_S_CODEC */
+struct ivtv_ioctl_codec {
+    uint32_t aspect;
+    uint32_t audio;
+    uint32_t bframes;
+    uint32_t bitrate;
+    uint32_t bitrate_peak;
+    uint32_t dnr_mode;
+    uint32_t dnr_spatial;
+    uint32_t dnr_temporal;
+    uint32_t dnr_type;
+    uint32_t framerate;
+    uint32_t framespergop;
+    uint32_t gop_closure;
+    uint32_t pulldown;
+    uint32_t stream_type;
+};
+
+/*****************************************************************************
+ * Prototypes
+ *****************************************************************************/
+static int     Open   ( vlc_object_t * );
+static void    Close  ( vlc_object_t * );
+
+static ssize_t Read   ( input_thread_t *, byte_t *, size_t );
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+vlc_module_begin();
+    set_description( _("Hauppauge PVR cards input") );
+    set_capability( "access", 0 );
+    add_shortcut( "pvr" );
+    set_callbacks( Open, Close );
+vlc_module_end();
+
+/*****************************************************************************
+ * Private access data
+ *****************************************************************************/
+struct access_sys_t
+{
+    /* file descriptor */
+    int i_fd;
+    
+    /* options */
+    int i_device;
+    int i_standard;
+    int i_width;
+    int i_height;
+    int i_frequency;
+    int i_framerate;
+    int i_bitrate;
+    int i_bitrate_peak;
+};
+
+/*****************************************************************************
+ * Open: open the device
+ *****************************************************************************/
+static int Open( vlc_object_t * p_this )
+{
+    input_thread_t * p_input = (input_thread_t*) p_this;
+    access_sys_t * p_sys;
+    char * psz_tofree, * psz_parser, * psz_device;
+
+    struct v4l2_format vfmt;
+    struct v4l2_frequency vf;
+    struct ivtv_ioctl_codec codec;
+    
+    p_input->pf_read = Read;
+    p_input->stream.b_pace_control = 0;
+    p_input->stream.b_seekable = 0;
+    p_input->i_pts_delay = 1000000;
+
+    /* create private access data */
+    p_sys = calloc( sizeof( access_sys_t ), 1 );
+    p_input->p_access_data = p_sys;
+
+    /* defaults values */
+    p_sys->i_device = 0;
+    p_sys->i_standard = V4L2_STD_SECAM;
+    p_sys->i_width = 720;
+    p_sys->i_height = 576;
+    p_sys->i_frequency = 567250; /* M6 ;) */
+    p_sys->i_framerate = 25;
+    p_sys->i_bitrate = 3000000;
+    p_sys->i_bitrate_peak = 4000000;
+
+    /* parse command line options */
+    /* TODO : _really_ parse all options ;) */
+    psz_tofree = strdup( p_input->psz_name );
+    psz_parser = psz_tofree;
+
+    if( *psz_parser )
+    {
+        for( ;; )
+        {
+            if( !strncmp( psz_parser, "device=", strlen( "device" ) ) )
+            {
+                p_sys->i_device = strtol( psz_parser + strlen( "device" ),
+                                          &psz_parser, 0 );
+            }
+            else if( !strncmp( psz_parser, "frequency=",
+                               strlen( "frequency=" ) ) )
+            {
+                p_sys->i_frequency =
+                    strtol( psz_parser + strlen( "frequency=" ),
+                            &psz_parser, 0 );
+            }
+            if( *psz_parser )
+                psz_parser++;
+            else
+                break;
+        }
+    }
+
+    free( psz_tofree );
+
+    msg_Dbg( p_input, "device: /dev/video%d, standard: %x, size: %dx%d, "
+             "framerate: %d, frequency: %d, bitrate: %d/%d",
+             p_sys->i_device, p_sys->i_standard, p_sys->i_width,
+             p_sys->i_height, p_sys->i_frequency, p_sys->i_framerate,
+             p_sys->i_bitrate, p_sys->i_bitrate_peak );
+
+    /* open the device */
+    psz_device = calloc( strlen( "/dev/videox" ) + 1, 1 );
+    sprintf( psz_device, "/dev/video%d", p_sys->i_device );
+    if( ( p_sys->i_fd = open( psz_device, O_RDWR ) ) < 0 )
+    {
+        msg_Err( p_input, "cannot open device (%s)", strerror( errno ) );
+        return VLC_EGENERIC;
+    }
+    free( psz_device );
+
+    /* set the video standard */
+    if( ioctl( p_sys->i_fd, VIDIOC_S_STD, &p_sys->i_standard ) < 0 )
+    {
+        msg_Warn( p_input, "VIDIOC_S_STD failed" );
+    }
+
+    /* set the picture size */
+    if( ioctl( p_sys->i_fd, VIDIOC_G_FMT, &vfmt ) < 0 )
+    {
+        msg_Warn( p_input, "VIDIOC_G_FMT failed" );
+    }
+    else
+    {
+        vfmt.fmt.pix.width = p_sys->i_width;
+        vfmt.fmt.pix.height = p_sys->i_height;
+        if( ioctl( p_sys->i_fd, VIDIOC_S_FMT, &vfmt ) < 0 )
+        {
+            msg_Warn( p_input, "VIDIOC_S_FMT failed" );
+        }
+    }
+
+    /* set the frequency */
+    vf.tuner = 0; /* TODO: let the user choose the tuner */
+    if( ioctl( p_sys->i_fd, VIDIOC_G_FREQUENCY, &vf ) < 0 )
+    {
+        msg_Warn( p_input, "VIDIOC_G_FREQUENCY failed (%s)",
+                  strerror( errno ) );
+    }
+    else
+    {
+        vf.frequency = p_sys->i_frequency * 16 / 1000;
+        if( ioctl( p_sys->i_fd, VIDIOC_S_FREQUENCY, &vf ) < 0 )
+        {
+            msg_Warn( p_input, "VIDIOC_S_FREQUENCY failed (%s)",
+                      strerror( errno ) );
+        }
+    }
+
+    /* codec parameters */
+    if( ioctl( p_sys->i_fd, IVTV_IOC_G_CODEC, &codec ) < 0 )
+    {
+        msg_Warn( p_input, "IVTV_IOC_G_CODEC failed" );
+    }
+    else
+    {
+        switch( p_sys->i_framerate )
+        {
+            case 30:
+                codec.framerate = 0;
+                break;
+
+            case 25:
+                codec.framerate = 1;
+                break;
+            
+            default:
+                msg_Warn( p_input, "invalid framerate, reverting to 25" );
+                codec.framerate = 1;
+                break;
+        }
+        codec.bitrate = p_sys->i_bitrate;
+        codec.bitrate_peak = p_sys->i_bitrate_peak;
+        if( ioctl( p_sys->i_fd, IVTV_IOC_S_CODEC, &codec ) < 0 )
+        {
+            msg_Warn( p_input, "IVTV_IOC_S_CODEC failed" );
+        }
+    }
+
+    return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Close: close the device
+ *****************************************************************************/
+static void Close( vlc_object_t * p_this )
+{
+    input_thread_t * p_input = (input_thread_t*) p_this;
+    access_sys_t * p_sys = p_input->p_access_data;
+
+    close( p_sys->i_fd );
+    free( p_sys );
+}
+
+/*****************************************************************************
+ * Read
+ *****************************************************************************/
+static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer,
+                     size_t i_len )
+{
+    access_sys_t * p_sys = p_input->p_access_data;
+
+    int i_ret;
+    
+    struct timeval timeout;
+    fd_set fds;
+
+    FD_ZERO( &fds );
+    FD_SET( p_sys->i_fd, &fds );
+    timeout.tv_sec = 0;
+    timeout.tv_usec = 500000;
+
+    while( !( i_ret = select( p_sys->i_fd + 1, &fds,
+                              NULL, NULL, &timeout ) ) )
+    {
+        FD_ZERO( &fds );
+        FD_SET( p_sys->i_fd, &fds );
+        timeout.tv_sec = 0;
+        timeout.tv_usec = 500000;
+
+        if( p_input->b_die || p_input->b_error )
+            return 0;
+    }
+
+    if( i_ret < 0 )
+    {
+        msg_Err( p_input, "select error (%s)", strerror( errno ) );
+        return -1;
+    }
+
+    i_ret = read( p_sys->i_fd, p_buffer, i_len );
+    return i_ret;
+}
+