Skip to content

V
vlc-2-2
Commit fb1dcab3 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

pvr: remove the old ivtv module 

This is a basically subset of the v4l2 access.
parent 70b74020
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 837 deletions
NEWS
View file @ fb1dcab3
......@@ -114,6 +114,7 @@ Removed modules:
* portaudio audio output: use the native audio output instead
* X11 On Screen Display notifications (xosd)
* Linux Framebuffer On Screen Display interface (fbosd)
* PVR: IVTV analog TV encoder - use V4L instead
* RTMP access: use libavformat avio instead
* RTMP access_output: use libavformat avio instead
* Hildon GUI
......
configure.ac
View file @ fb1dcab3
......@@ -1726,19 +1726,12 @@ dnl Video4Linux 2
dnl
AC_ARG_ENABLE(v4l2, [AS_HELP_STRING([--disable-v4l2],
[disable Video4Linux version 2 (default auto)])])
AC_ARG_ENABLE(pvr, [AS_HELP_STRING([--enable-pvr],
[support PVR V4L2 cards (default disabled)])])
have_v4l2="no"
AS_IF([test "$enable_v4l2" != "no"], [
AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h], [
have_v4l2="yes"
])
])
AS_IF([test "$have_v4l2" = "yes"], [
AS_IF([test "${enable_pvr}" = "yes"], [
VLC_ADD_PLUGIN([pvr])
])
])
AM_CONDITIONAL(HAVE_V4L2, [test "${have_v4l2}" != "no"])
dnl
......
modules/LIST
View file @ fb1dcab3
......@@ -256,7 +256,6 @@ $Id$
* pulsesrc: PulseAudio audio input
* puzzle: puzzle video filter
* pva: PVA demuxer
* pvr: input module to read from a PVR card
* qt4: interface module using the cross-platform Qt4 library
* qtcapture: Quicktime Video Capture
* qtsound: Quicktime Audio Capture
......
modules/access/Modules.am
View file @ fb1dcab3
......@@ -41,7 +41,6 @@ SOURCES_access_gnomevfs = gnomevfs.c
SOURCES_access_eyetv = eyetv.m
SOURCES_dc1394 = dc1394.c
SOURCES_dv1394 = dv.c
SOURCES_pvr = pvr.c
SOURCES_linsys_sdi = linsys/linsys_sdi.c linsys/linsys_sdi.h
SOURCES_linsys_hdsdi = \
linsys/linsys_hdsdi.c \
......
modules/access/pvr.c deleted 100644 → 0
View file @ 70b74020
/*****************************************************************************
* pvr.c
*****************************************************************************
* Copyright (C) 2001, 2002 the VideoLAN team
* $Id$
*
* Authors: Eric Petit <titer@videolan.org>
* Paul Corke <paulc@datatote.co.uk>
*
* 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
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_fs.h>
#include <vlc_url.h>
#include <vlc_network.h>
#include <sys/types.h>
#include <fcntl.h>
#include <unistd.h>
#include <linux/types.h>
#include <sys/ioctl.h>
#if defined(HAVE_LINUX_VIDEODEV2_H)
# include <linux/videodev2.h>
#elif defined(HAVE_SYS_VIDEOIO_H)
# include <sys/videoio.h>
#else
# error "No Video4Linux2 headers found."
#endif
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
#define DEVICE_TEXT N_( "Device" )
#define DEVICE_LONGTEXT N_( "PVR video device" )
#define RADIO_DEVICE_TEXT N_( "Radio device" )
#define RADIO_DEVICE_LONGTEXT N_( "PVR radio device" )
#define NORM_TEXT N_( "Norm" )
#define NORM_LONGTEXT N_( "Norm of the stream " \
"(Automatic, SECAM, PAL, or NTSC)." )
#define WIDTH_TEXT N_( "Width" )
#define WIDTH_LONGTEXT N_( "Width of the stream to capture " \
"(-1 for autodetection)." )
#define HEIGHT_TEXT N_( "Height" )
#define HEIGHT_LONGTEXT N_( "Height of the stream to capture " \
"(-1 for autodetection)." )
#define FREQUENCY_TEXT N_( "Frequency" )
#define FREQUENCY_LONGTEXT N_( "Frequency to capture (in kHz), if applicable." )
#define FRAMERATE_TEXT N_( "Framerate" )
#define FRAMERATE_LONGTEXT N_( "Framerate to capture, if applicable " \
"(-1 for autodetect)." )
#define KEYINT_TEXT N_( "Key interval" )
#define KEYINT_LONGTEXT N_( "Interval between keyframes (-1 for autodetect)." )
#define BFRAMES_TEXT N_( "B Frames" )
#define BFRAMES_LONGTEXT N_("If this option is set, B-Frames will be used. " \
"Use this option to set the number of B-Frames.")
#define BITRATE_TEXT N_( "Bitrate" )
#define BITRATE_LONGTEXT N_( "Bitrate to use (-1 for default)." )
#define BITRATE_PEAK_TEXT N_( "Bitrate peak" )
#define BITRATE_PEAK_LONGTEXT N_( "Peak bitrate in VBR mode." )
#define BITRATE_MODE_TEXT N_( "Bitrate mode" )
#define BITRATE_MODE_LONGTEXT N_( "Bitrate mode to use (VBR or CBR)." )
#define BITMASK_TEXT N_( "Audio bitmask" )
#define BITMASK_LONGTEXT N_("Bitmask that will "\
"get used by the audio part of the card." )
#define VOLUME_TEXT N_( "Volume" )
#define VOLUME_LONGTEXT N_("Audio volume (0-65535)." )
#define CHAN_TEXT N_( "Channel" )
#define CHAN_LONGTEXT N_( "Channel of the card to use (Usually, 0 = tuner, " \
"1 = composite, 2 = svideo)" )
static const int i_norm_list[] =
{ V4L2_STD_UNKNOWN, V4L2_STD_SECAM, V4L2_STD_PAL, V4L2_STD_NTSC };
static const char *const psz_norm_list_text[] =
{ N_("Automatic"), N_("SECAM"), N_("PAL"), N_("NTSC") };
static const int i_bitrates[] = { 0, 1 };
static const char *const psz_bitrates_list_text[] = { N_("vbr"), N_("cbr") };
static const int pi_radio_range[2] = { 65000, 108000 };
vlc_module_begin ()
set_shortname( N_("PVR") )
set_description( N_("IVTV MPEG Encoding cards input") )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_ACCESS )
set_capability( "access", 0 )
add_shortcut( "pvr" )
add_string( "pvr-device", "/dev/video0", DEVICE_TEXT,
DEVICE_LONGTEXT, false )
add_string( "pvr-radio-device", "/dev/radio0", RADIO_DEVICE_TEXT,
RADIO_DEVICE_LONGTEXT, false )
add_integer( "pvr-norm", V4L2_STD_UNKNOWN , NORM_TEXT,
NORM_LONGTEXT, false )
change_integer_list( i_norm_list, psz_norm_list_text )
add_integer( "pvr-width", -1, WIDTH_TEXT, WIDTH_LONGTEXT, true )
add_integer( "pvr-height", -1, HEIGHT_TEXT, HEIGHT_LONGTEXT,
true )
add_integer( "pvr-frequency", -1, FREQUENCY_TEXT, FREQUENCY_LONGTEXT,
false )
add_integer( "pvr-framerate", -1, FRAMERATE_TEXT, FRAMERATE_LONGTEXT,
true )
add_integer( "pvr-keyint", -1, KEYINT_TEXT, KEYINT_LONGTEXT,
true )
add_integer( "pvr-bframes", -1, FRAMERATE_TEXT, FRAMERATE_LONGTEXT,
true )
add_integer( "pvr-bitrate", -1, BITRATE_TEXT, BITRATE_LONGTEXT,
false )
add_integer( "pvr-bitrate-peak", -1, BITRATE_PEAK_TEXT,
BITRATE_PEAK_LONGTEXT, true )
add_integer( "pvr-bitrate-mode", -1, BITRATE_MODE_TEXT,
BITRATE_MODE_LONGTEXT, true )
change_integer_list( i_bitrates, psz_bitrates_list_text )
add_integer( "pvr-audio-bitmask", -1, BITMASK_TEXT,
BITMASK_LONGTEXT, true )
add_integer( "pvr-audio-volume", -1, VOLUME_TEXT,
VOLUME_LONGTEXT, true )
add_integer( "pvr-channel", -1, CHAN_TEXT, CHAN_LONGTEXT, true )
set_callbacks( Open, Close )
vlc_module_end ()
/*****************************************************************************
* Prototypes
*****************************************************************************/
static ssize_t Read ( access_t *, uint8_t *, size_t );
static int Control( access_t *, int, va_list );
struct access_sys_t
{
/* file descriptor */
int i_fd;
int i_radio_fd;
char *psz_videodev;
char *psz_radiodev;
/* options */
int i_standard;
int i_width;
int i_height;
int i_frequency;
int i_framerate;
int i_keyint;
int i_bframes;
int i_bitrate;
int i_bitrate_peak;
int i_bitrate_mode;
int i_audio_bitmask;
int i_input;
int i_volume;
};
#define MAX_V4L2_CTRLS (6)
/*****************************************************************************
* AddV4L2Ctrl: adds a control to the v4l2 controls list
*****************************************************************************/
static void AddV4L2Ctrl( access_t * p_access,
struct v4l2_ext_controls * p_controls,
uint32_t i_id, uint32_t i_value )
{
if( p_controls->count >= MAX_V4L2_CTRLS )
{
msg_Err( p_access, "Tried to set too many v4l2 controls at once." );
return;
}
p_controls->controls[p_controls->count].id = i_id;
p_controls->controls[p_controls->count].value = i_value;
p_controls->count++;
}
/*****************************************************************************
* V4L2SampleRate: calculate v4l2 sample rate from pvr-audio-bitmask
*****************************************************************************/
static uint32_t V4L2SampleRate( uint32_t i_bitmask )
{
switch( i_bitmask & 0x0003 )
{
case 0x0001: return V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000;
case 0x0002: return V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000;
}
return V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100;
}
/*****************************************************************************
* V4L2AudioEncoding: calculate v4l2 audio encoding level from pvr-audio-bitmask
*****************************************************************************/
static uint32_t V4L2AudioEncoding( uint32_t i_bitmask )
{
switch( i_bitmask & 0x000c )
{
case 0x0004: return V4L2_MPEG_AUDIO_ENCODING_LAYER_1;
case 0x0008: return V4L2_MPEG_AUDIO_ENCODING_LAYER_2;
}
return 0xffffffff;
}
/*****************************************************************************
* V4L2AudioL1Bitrate: calculate v4l2 audio bitrate for layer-1 audio from pvr-audio-bitmask
*****************************************************************************/
static uint32_t V4L2AudioL1Bitrate( uint32_t i_bitmask )
{
switch( i_bitmask & 0x00f0 )
{
case 0x0010: return V4L2_MPEG_AUDIO_L1_BITRATE_32K;
case 0x0020: return V4L2_MPEG_AUDIO_L1_BITRATE_64K;
case 0x0030: return V4L2_MPEG_AUDIO_L1_BITRATE_96K;
case 0x0040: return V4L2_MPEG_AUDIO_L1_BITRATE_128K;
case 0x0050: return V4L2_MPEG_AUDIO_L1_BITRATE_160K;
case 0x0060: return V4L2_MPEG_AUDIO_L1_BITRATE_192K;
case 0x0070: return V4L2_MPEG_AUDIO_L1_BITRATE_224K;
case 0x0080: return V4L2_MPEG_AUDIO_L1_BITRATE_256K;
case 0x0090: return V4L2_MPEG_AUDIO_L1_BITRATE_288K;
case 0x00a0: return V4L2_MPEG_AUDIO_L1_BITRATE_320K;
case 0x00b0: return V4L2_MPEG_AUDIO_L1_BITRATE_352K;
case 0x00c0: return V4L2_MPEG_AUDIO_L1_BITRATE_384K;
case 0x00d0: return V4L2_MPEG_AUDIO_L1_BITRATE_416K;
case 0x00e0: return V4L2_MPEG_AUDIO_L1_BITRATE_448K;
}
return V4L2_MPEG_AUDIO_L1_BITRATE_320K;
}
/*****************************************************************************
* V4L2AudioL2Bitrate: calculate v4l2 audio bitrate for layer-1 audio from pvr-audio-bitmask
*****************************************************************************/
static uint32_t V4L2AudioL2Bitrate( uint32_t i_bitmask )
{
switch( i_bitmask & 0x00f0 )
{
case 0x0010: return V4L2_MPEG_AUDIO_L2_BITRATE_32K;
case 0x0020: return V4L2_MPEG_AUDIO_L2_BITRATE_48K;
case 0x0030: return V4L2_MPEG_AUDIO_L2_BITRATE_56K;
case 0x0040: return V4L2_MPEG_AUDIO_L2_BITRATE_64K;
case 0x0050: return V4L2_MPEG_AUDIO_L2_BITRATE_80K;
case 0x0060: return V4L2_MPEG_AUDIO_L2_BITRATE_96K;
case 0x0070: return V4L2_MPEG_AUDIO_L2_BITRATE_112K;
case 0x0080: return V4L2_MPEG_AUDIO_L2_BITRATE_128K;
case 0x0090: return V4L2_MPEG_AUDIO_L2_BITRATE_160K;
case 0x00a0: return V4L2_MPEG_AUDIO_L2_BITRATE_192K;
case 0x00b0: return V4L2_MPEG_AUDIO_L2_BITRATE_224K;
case 0x00c0: return V4L2_MPEG_AUDIO_L2_BITRATE_256K;
case 0x00d0: return V4L2_MPEG_AUDIO_L2_BITRATE_320K;
case 0x00e0: return V4L2_MPEG_AUDIO_L2_BITRATE_384K;
}
return V4L2_MPEG_AUDIO_L2_BITRATE_192K;
}
/*****************************************************************************
* V4L2AudioMode: calculate v4l2 audio mode from pvr-audio-bitmask
*****************************************************************************/
static uint32_t V4L2AudioMode( uint32_t i_bitmask )
{
switch( i_bitmask & 0x0300 )
{
case 0x0100: return V4L2_MPEG_AUDIO_MODE_JOINT_STEREO;
case 0x0200: return V4L2_MPEG_AUDIO_MODE_DUAL;
case 0x0300: return V4L2_MPEG_AUDIO_MODE_MONO;
}
return V4L2_MPEG_AUDIO_MODE_STEREO;
}
/*****************************************************************************
* ConfigureV4L2: set up codec parameters using the new v4l2 api
*****************************************************************************/
static int ConfigureV4L2( access_t * p_access )
{
access_sys_t *p_sys = (access_sys_t *) p_access->p_sys;
struct v4l2_ext_controls controls;
int result;
memset( &controls, 0, sizeof(struct v4l2_ext_controls) );
controls.ctrl_class = V4L2_CTRL_CLASS_MPEG;
controls.error_idx = 0;
controls.reserved[0] = 0;
controls.reserved[1] = 0;
controls.count = 0;
controls.controls = calloc( MAX_V4L2_CTRLS,
sizeof( struct v4l2_ext_control ) );
if( controls.controls == NULL )
return VLC_ENOMEM;
/* Note: Ignore frame rate. Doesn't look like it can be changed. */
if( p_sys->i_bitrate != -1 )
{
AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_VIDEO_BITRATE,
p_sys->i_bitrate );
msg_Dbg( p_access, "Setting [%u] bitrate = %u",
controls.count - 1, p_sys->i_bitrate );
}
if( p_sys->i_bitrate_peak != -1 )
{
AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_VIDEO_BITRATE_PEAK,
p_sys->i_bitrate_peak );
msg_Dbg( p_access, "Setting [%u] bitrate_peak = %u",
controls.count - 1, p_sys->i_bitrate_peak );
}
if( p_sys->i_bitrate_mode != -1 )
{
AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_VIDEO_BITRATE_MODE,
p_sys->i_bitrate_mode );
msg_Dbg( p_access, "Setting [%u] bitrate_mode = %u",
controls.count - 1, p_sys->i_bitrate_mode );
}
if( p_sys->i_audio_bitmask != -1 )
{
/* Sample rate */
AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ,
V4L2SampleRate( p_sys->i_audio_bitmask ) );
/* Encoding layer and bitrate */
switch( V4L2AudioEncoding( p_sys->i_audio_bitmask ) )
{
case V4L2_MPEG_AUDIO_ENCODING_LAYER_1:
AddV4L2Ctrl( p_access, &controls,
V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ,
V4L2_MPEG_AUDIO_ENCODING_LAYER_1 );
AddV4L2Ctrl( p_access, &controls,
V4L2_CID_MPEG_AUDIO_L1_BITRATE,
V4L2AudioL1Bitrate( p_sys->i_audio_bitmask ) );
break;
case V4L2_MPEG_AUDIO_ENCODING_LAYER_2:
AddV4L2Ctrl( p_access, &controls,
V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ,
V4L2_MPEG_AUDIO_ENCODING_LAYER_2 );
AddV4L2Ctrl( p_access, &controls,
V4L2_CID_MPEG_AUDIO_L2_BITRATE,
V4L2AudioL2Bitrate( p_sys->i_audio_bitmask ) );
break;
}
/* Audio mode - stereo or mono */
AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_AUDIO_MODE,
V4L2AudioMode( p_sys->i_audio_bitmask ) );
/* See if the user wants any other audio feature */
if( ( p_sys->i_audio_bitmask & 0x1ff00 ) != 0 )
{
/* It would be possible to support the bits that represent:
* V4L2_CID_MPEG_AUDIO_MODE_EXTENSION
* V4L2_CID_MPEG_AUDIO_EMPHASIS
* V4L2_CID_MPEG_AUDIO_CRC
* but they are not currently used. Tell the user.
*/
msg_Err( p_access, "There were bits in pvr-audio-bitmask that were not used.");
}
msg_Dbg( p_access, "Setting audio controls");
}
if( p_sys->i_keyint != -1 )
{
AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_VIDEO_GOP_SIZE,
p_sys->i_keyint );
msg_Dbg( p_access, "Setting [%u] keyint = %u",
controls.count - 1, p_sys->i_keyint );
}
if( p_sys->i_bframes != -1 )
{
AddV4L2Ctrl( p_access, &controls, V4L2_CID_MPEG_VIDEO_B_FRAMES,
p_sys->i_bframes );
msg_Dbg( p_access, "Setting [%u] bframes = %u",
controls.count - 1, p_sys->i_bframes );
}
result = ioctl( p_sys->i_fd, VIDIOC_S_EXT_CTRLS, &controls );
if( result < 0 )
{
msg_Err( p_access, "Failed to write %u new capture card settings.",
controls.error_idx );
}
free( controls.controls );
return VLC_SUCCESS;
}
/*****************************************************************************
* Open: open the device
*****************************************************************************/
static int Open( vlc_object_t * p_this )
{
access_t *p_access = (access_t*) p_this;
access_sys_t * p_sys;
char * psz_tofree;
char * psz_parser;
struct v4l2_capability device_capability;
int result;
memset( &device_capability, 0, sizeof(struct v4l2_capability) );
access_InitFields( p_access );
ACCESS_SET_CALLBACKS( Read, NULL, Control, NULL );
p_sys = p_access->p_sys = calloc( 1, sizeof( access_sys_t ));
if( !p_sys ) return VLC_ENOMEM;
/* defaults values */
p_sys->psz_videodev = var_InheritString( p_access, "pvr-device" );
p_sys->psz_radiodev = var_InheritString( p_access, "pvr-radio-device" );
p_sys->i_standard = var_InheritInteger( p_access, "pvr-norm" );
p_sys->i_width = var_InheritInteger( p_access, "pvr-width" );
p_sys->i_height = var_InheritInteger( p_access, "pvr-height" );
p_sys->i_frequency = var_InheritInteger( p_access, "pvr-frequency" );
p_sys->i_framerate = var_InheritInteger( p_access, "pvr-framerate" );
p_sys->i_keyint = var_InheritInteger( p_access, "pvr-keyint" );
p_sys->i_bframes = var_InheritInteger( p_access, "pvr-bframes" );
p_sys->i_bitrate = var_InheritInteger( p_access, "pvr-bitrate" );
p_sys->i_bitrate_peak = var_InheritInteger( p_access, "pvr-bitrate-peak" );
p_sys->i_bitrate_mode = var_InheritInteger( p_access, "pvr-bitrate-mode" );
p_sys->i_audio_bitmask = var_InheritInteger( p_access, "pvr-audio-bitmask" );
p_sys->i_volume = var_InheritInteger( p_access, "pvr-audio-volume" );
p_sys->i_input = var_InheritInteger( p_access, "pvr-channel" );
/* parse command line options */
psz_tofree = strdup( p_access->psz_location );
if( !psz_tofree )
{
free( p_sys->psz_radiodev );
free( p_sys->psz_videodev );
free( p_sys );
return VLC_ENOMEM;
}
psz_parser = psz_tofree;
while( *psz_parser )
{
/* Leading slash -> device path */
if( *psz_parser == '/' )
{
free( p_sys->psz_videodev );
p_sys->psz_videodev = decode_URI_duplicate( psz_parser );
break;
}
/* Extract option name */
const char *optname = psz_parser;
psz_parser = strchr( psz_parser, '=' );
if( psz_parser == NULL )
break;
*psz_parser++ = '\0';
/* Extract option value */
char *optval = psz_parser;
while( memchr( ":,", *psz_parser, 3 /* includes \0 */ ) == NULL )
psz_parser++;
if( *psz_parser ) /* more options to come */
*psz_parser++ = '\0'; /* skip , or : */
if ( !strcmp( optname, "norm" ) )
{
if ( !strcmp( optval, "secam" ) )
p_sys->i_standard = V4L2_STD_SECAM;
else if ( !strcmp( optval, "pal" ) )
p_sys->i_standard = V4L2_STD_PAL;
else if ( !strcmp( optval, "ntsc" ) )
p_sys->i_standard = V4L2_STD_NTSC;
else
p_sys->i_standard = atoi( optval );
}
else if( !strcmp( optname, "channel" ) )
p_sys->i_input = atoi( optval );
else if( !strcmp( optname, "device" ) )
{
free( p_sys->psz_videodev );
if( asprintf( &p_sys->psz_videodev, "/dev/video%s", optval ) == -1)
p_sys->psz_videodev = NULL;
}
else if( !strcmp( optname, "frequency" ) )
p_sys->i_frequency = atoi( optval );
else if( !strcmp( optname, "framerate" ) )
p_sys->i_framerate = atoi( optval );
else if( !strcmp( optname, "keyint" ) )
p_sys->i_keyint = atoi( optval );
else if( !strcmp( optname, "bframes" ) )
p_sys->i_bframes = atoi( optval );
else if( !strcmp( optname, "width" ) )
p_sys->i_width = atoi( optval );
else if( !strcmp( optname, "height" ) )
p_sys->i_height = atoi( optval );
else if( !strcmp( optname, "audio" ) )
p_sys->i_audio_bitmask = atoi( optval );
else if( !strcmp( optname, "bitrate" ) )
p_sys->i_bitrate = atoi( optval );
else if( !strcmp( optname, "maxbitrate" ) )
p_sys->i_bitrate_peak = atoi( optval );
else if( !strcmp( optname, "bitratemode" ) )
{
if( !strcmp( optval, "vbr" ) )
p_sys->i_bitrate_mode = 0;
else if( !strcmp( optval, "cbr" ) )
p_sys->i_bitrate_mode = 1;
}
else if( !strcmp( optname, "size" ) )
{
p_sys->i_width = strtol( optval, &optval, 0 );
p_sys->i_height = atoi( optval );
}
}
free( psz_tofree );
/* open the device */
p_sys->i_fd = vlc_open( p_sys->psz_videodev, O_RDWR );
if( p_sys->i_fd < 0 )
{
msg_Err( p_access, "Cannot open device %s (%m).",
p_sys->psz_videodev );
Close( VLC_OBJECT(p_access) );
return VLC_EGENERIC;
}
msg_Dbg( p_access, "Using video device: %s.", p_sys->psz_videodev);
/* See what version of ivtvdriver is running */
result = ioctl( p_sys->i_fd, VIDIOC_QUERYCAP, &device_capability );
if( result < 0 )
{
msg_Err( p_access, "unknown ivtv/pvr driver version in use" );
Close( VLC_OBJECT(p_access) );
return VLC_EGENERIC;
}
msg_Dbg( p_access, "%s driver (%s on %s) version %02x.%02x.%02x",
device_capability.driver,
device_capability.card,
device_capability.bus_info,
( device_capability.version >> 16 ) & 0xff,
( device_capability.version >> 8 ) & 0xff,
( device_capability.version ) & 0xff);
/* set the input */
if ( p_sys->i_input != -1 )
{
result = ioctl( p_sys->i_fd, VIDIOC_S_INPUT, &p_sys->i_input );
if ( result < 0 )
msg_Warn( p_access, "Failed to select the requested input pin." );
else
msg_Dbg( p_access, "input set to: %d", p_sys->i_input );
}
/* set the video standard */
if ( p_sys->i_standard != V4L2_STD_UNKNOWN )
{
result = ioctl( p_sys->i_fd, VIDIOC_S_STD, &p_sys->i_standard );
if ( result < 0 )
msg_Warn( p_access, "Failed to set the requested video standard." );
else
msg_Dbg( p_access, "video standard set to: %x",
p_sys->i_standard);
}
/* set the picture size */
if ( (p_sys->i_width != -1) || (p_sys->i_height != -1) )
{
struct v4l2_format vfmt;
memset( &vfmt, 0, sizeof(struct v4l2_format) );
vfmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
result = ioctl( p_sys->i_fd, VIDIOC_G_FMT, &vfmt );
if ( result < 0 )
{
msg_Warn( p_access, "Failed to read current picture size." );
}
else
{
if ( p_sys->i_width != -1 )
{
vfmt.fmt.pix.width = p_sys->i_width;
}
if ( p_sys->i_height != -1 )
{
vfmt.fmt.pix.height = p_sys->i_height;
}
result = ioctl( p_sys->i_fd, VIDIOC_S_FMT, &vfmt );
if ( result < 0 )
{
msg_Warn( p_access, "Failed to set requested picture size." );
}
else
{
msg_Dbg( p_access, "picture size set to: %dx%d",
vfmt.fmt.pix.width, vfmt.fmt.pix.height );
}
}
}
/* set the frequency */
if ( p_sys->i_frequency != -1 )
{
int i_fd;
struct v4l2_tuner vt;
/* TODO: let the user choose the tuner */
memset( &vt, 0, sizeof(struct v4l2_tuner) );
if ( (p_sys->i_frequency >= pi_radio_range[0])
&& (p_sys->i_frequency <= pi_radio_range[1]) )
{
p_sys->i_radio_fd = vlc_open( p_sys->psz_radiodev, O_RDWR );
if( p_sys->i_radio_fd < 0 )
{
msg_Err( p_access, "Cannot open radio device (%m)." );
Close( VLC_OBJECT(p_access) );
return VLC_EGENERIC;
}
msg_Dbg( p_access, "using radio device: %s",
p_sys->psz_radiodev );
i_fd = p_sys->i_radio_fd;
}
else
{
i_fd = p_sys->i_fd;
p_sys->i_radio_fd = -1;
}
result = ioctl( i_fd, VIDIOC_G_TUNER, &vt );
if ( result < 0 )
{
msg_Warn( p_access, "Failed to read tuner information (%m)." );
}
else
{
struct v4l2_frequency vf;
memset( &vf, 0, sizeof(struct v4l2_frequency) );
vf.tuner = vt.index;
result = ioctl( i_fd, VIDIOC_G_FREQUENCY, &vf );
if ( result < 0 )
{
msg_Warn( p_access, "Failed to read tuner frequency (%m)." );
}
else
{
if( vt.capability & V4L2_TUNER_CAP_LOW )
vf.frequency = p_sys->i_frequency * 16;
else
vf.frequency = (p_sys->i_frequency * 16 + 500) / 1000;
result = ioctl( i_fd, VIDIOC_S_FREQUENCY, &vf );
if( result < 0 )
{
msg_Warn( p_access, "Failed to set tuner frequency (%m)." );
}
else
{
msg_Dbg( p_access, "tuner frequency set to: %d",
p_sys->i_frequency );
}
}
}
}
/* control parameters */
if ( p_sys->i_volume != -1 )
{
struct v4l2_control ctrl;
memset( &ctrl, 0, sizeof(struct v4l2_control) );
ctrl.id = V4L2_CID_AUDIO_VOLUME;
ctrl.value = p_sys->i_volume;
result = ioctl( p_sys->i_fd, VIDIOC_S_CTRL, &ctrl );
if ( result < 0 )
{
msg_Warn( p_access, "Failed to set the volume." );
}
}
/* codec parameters */
if ( (p_sys->i_framerate != -1)
|| (p_sys->i_bitrate_mode != -1)
|| (p_sys->i_bitrate_peak != -1)
|| (p_sys->i_keyint != -1)
|| (p_sys->i_bframes != -1)
|| (p_sys->i_bitrate != -1)
|| (p_sys->i_audio_bitmask != -1) )
{
result = ConfigureV4L2( p_access );
if( result != VLC_SUCCESS )
{
Close( VLC_OBJECT(p_access) );
return result;
}
}
return VLC_SUCCESS;
}
/*****************************************************************************
* Close: close the device
*****************************************************************************/
static void Close( vlc_object_t * p_this )
{
access_t *p_access = (access_t*) p_this;
access_sys_t *p_sys = (access_sys_t *) p_access->p_sys;
if ( p_sys->i_fd != -1 )
close( p_sys->i_fd );
if ( p_sys->i_radio_fd != -1 )
close( p_sys->i_radio_fd );
free( p_sys->psz_videodev );
free( p_sys->psz_radiodev );
free( p_sys );
}
/*****************************************************************************
* Read
*****************************************************************************/
static ssize_t Read( access_t * p_access, uint8_t * p_buffer, size_t i_len )
{
access_sys_t *p_sys = (access_sys_t *) p_access->p_sys;
ssize_t i_ret;
if( p_access->info.b_eof )
return 0;
i_ret = net_Read( p_access, p_sys->i_fd, NULL, p_buffer, i_len, false );
if( i_ret == 0 )
{
p_access->info.b_eof = true;
}
else if( i_ret > 0 )
{
p_access->info.i_pos += i_ret;
}
return i_ret;
}
/*****************************************************************************
* Control
*****************************************************************************/
static int Control( access_t *p_access, int i_query, va_list args )
{
bool *pb_bool;
int64_t *pi_64;
switch( i_query )
{
/* */
case ACCESS_CAN_SEEK:
case ACCESS_CAN_FASTSEEK:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = false;
break;
case ACCESS_CAN_PAUSE:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = false;
break;
case ACCESS_CAN_CONTROL_PACE:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = false;
break;
/* */
case ACCESS_GET_PTS_DELAY:
pi_64 = (int64_t*)va_arg( args, int64_t * );
*pi_64 = INT64_C(1000)
* var_InheritInteger( p_access, "live-caching" );
break;
/* */
case ACCESS_SET_PAUSE_STATE:
/* Nothing to do */
break;
case ACCESS_GET_TITLE_INFO:
case ACCESS_SET_TITLE:
case ACCESS_SET_SEEKPOINT:
case ACCESS_SET_PRIVATE_ID_STATE:
case ACCESS_GET_CONTENT_TYPE:
return VLC_EGENERIC;
default:
msg_Warn( p_access, "Unimplemented query in control." );
return VLC_EGENERIC;
}
return VLC_SUCCESS;
}
po/POTFILES.in
View file @ fb1dcab3
......@@ -233,7 +233,6 @@ modules/access_output/livehttp.c
modules/access_output/shout.c
modules/access_output/udp.c
modules/access/pulse.c
modules/access/pvr.c
modules/access/qtcapture.m
modules/access/rar/access.c
modules/access/rar/rar.c
......
src/input/item.c
View file @ fb1dcab3
......@@ -947,7 +947,6 @@ static int GuessType( const input_item_t *p_item )
{ "ofdm", ITEM_TYPE_CARD },
{ "oss", ITEM_TYPE_CARD },
{ "pnm", ITEM_TYPE_NET },
{ "pvr", ITEM_TYPE_CARD },
{ "qam", ITEM_TYPE_CARD },
{ "qpsk", ITEM_TYPE_CARD },
{ "qtcapt", ITEM_TYPE_CARD }, /* qtcapture */
......
src/libvlc-module.c
View file @ fb1dcab3
......@@ -1846,7 +1846,6 @@ vlc_module_begin ()
add_obsolete_integer( "linsys-hdsdi-caching" ) /* 2.0.0 */
add_obsolete_integer( "linsys-sdi-caching" ) /* 2.0.0 */
add_obsolete_integer( "oss-caching" ) /* 2.0.0 */
add_obsolete_integer( "pvr-caching" ) /* 2.0.0 */
add_obsolete_integer( "screen-caching" ) /* 2.0.0 */
add_obsolete_integer( "v4l2-caching" ) /* 2.0.0 */
add_integer( "disc-caching", DEFAULT_PTS_DELAY / 1000,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment