/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/vout.h>
-#include <codecs.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_input.h>
+#include <vlc_demux.h>
+#include <vlc_access.h>
+#include <vlc_vout.h>
+#include <vlc_codecs.h>
#include <sys/types.h>
#include <sys/stat.h>
static int i_norm_list[] =
{ VIDEO_MODE_AUTO, VIDEO_MODE_SECAM, VIDEO_MODE_PAL, VIDEO_MODE_NTSC };
-static char *psz_norm_list_text[] =
+static const char *const psz_norm_list_text[] =
{ N_("Automatic"), N_("SECAM"), N_("PAL"), N_("NTSC") };
vlc_module_begin();
- set_shortname( _("Video4Linux") );
- set_description( _("Video4Linux input") );
+ set_shortname( N_("Video4Linux") );
+ set_description( N_("Video4Linux input") );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_ACCESS );
add_integer( "v4l-caching", DEFAULT_PTS_DELAY / 1000, NULL,
- CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
+ CACHING_TEXT, CACHING_LONGTEXT, true );
add_string( "v4l-vdev", "/dev/video", 0, VDEV_TEXT, VDEV_LONGTEXT,
- VLC_FALSE );
+ false );
add_string( "v4l-adev", "/dev/dsp", 0, ADEV_TEXT, ADEV_LONGTEXT,
- VLC_FALSE );
+ false );
add_string( "v4l-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
- VLC_TRUE );
- add_float( "v4l-fps", -1.0, NULL, FPS_TEXT, FPS_LONGTEXT, VLC_TRUE );
+ true );
+ add_float( "v4l-fps", -1.0, NULL, FPS_TEXT, FPS_LONGTEXT, true );
add_integer( "v4l-samplerate", 44100, NULL, SAMPLERATE_TEXT,
- SAMPLERATE_LONGTEXT, VLC_TRUE );
+ SAMPLERATE_LONGTEXT, true );
add_integer( "v4l-channel", 0, NULL, CHANNEL_TEXT, CHANNEL_LONGTEXT,
- VLC_TRUE );
- add_integer( "v4l-tuner", -1, NULL, TUNER_TEXT, TUNER_LONGTEXT, VLC_TRUE );
+ true );
+ add_integer( "v4l-tuner", -1, NULL, TUNER_TEXT, TUNER_LONGTEXT, true );
add_integer( "v4l-norm", VIDEO_MODE_AUTO, NULL, NORM_TEXT, NORM_LONGTEXT,
- VLC_FALSE );
+ false );
change_integer_list( i_norm_list, psz_norm_list_text, 0 );
add_integer( "v4l-frequency", -1, NULL, FREQUENCY_TEXT, FREQUENCY_LONGTEXT,
- VLC_FALSE );
- add_integer( "v4l-audio", -1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, VLC_TRUE );
- add_bool( "v4l-stereo", VLC_TRUE, NULL, STEREO_TEXT, STEREO_LONGTEXT,
- VLC_TRUE );
- add_integer( "v4l-width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE );
+ false );
+ add_integer( "v4l-audio", -1, NULL, AUDIO_TEXT, AUDIO_LONGTEXT, true );
+ add_bool( "v4l-stereo", true, NULL, STEREO_TEXT, STEREO_LONGTEXT,
+ true );
+ add_integer( "v4l-width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true );
add_integer( "v4l-height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT,
- VLC_TRUE );
+ true );
add_integer( "v4l-brightness", -1, NULL, BRIGHTNESS_TEXT,
- BRIGHTNESS_LONGTEXT, VLC_TRUE );
+ BRIGHTNESS_LONGTEXT, true );
add_integer( "v4l-colour", -1, NULL, COLOUR_TEXT, COLOUR_LONGTEXT,
- VLC_TRUE );
- add_integer( "v4l-hue", -1, NULL, HUE_TEXT, HUE_LONGTEXT, VLC_TRUE );
+ true );
+ add_integer( "v4l-hue", -1, NULL, HUE_TEXT, HUE_LONGTEXT, true );
add_integer( "v4l-contrast", -1, NULL, CONTRAST_TEXT, CONTRAST_LONGTEXT,
- VLC_TRUE );
- add_bool( "v4l-mjpeg", VLC_FALSE, NULL, MJPEG_TEXT, MJPEG_LONGTEXT,
- VLC_TRUE );
+ true );
+ add_bool( "v4l-mjpeg", false, NULL, MJPEG_TEXT, MJPEG_LONGTEXT,
+ true );
add_integer( "v4l-decimation", 1, NULL, DECIMATION_TEXT,
- DECIMATION_LONGTEXT, VLC_TRUE );
+ DECIMATION_LONGTEXT, true );
add_integer( "v4l-quality", 100, NULL, QUALITY_TEXT, QUALITY_LONGTEXT,
- VLC_TRUE );
+ true );
add_shortcut( "v4l" );
set_capability( "access_demux", 10 );
{ VIDEO_PALETTE_RGB555, VLC_FOURCC( 'R', 'V', '1', '5' ) },
{ VIDEO_PALETTE_RGB24, VLC_FOURCC( 'R', 'V', '2', '4' ) },
{ VIDEO_PALETTE_RGB32, VLC_FOURCC( 'R', 'V', '3', '2' ) },
- { VIDEO_PALETTE_YUV422, VLC_FOURCC( 'I', '4', '2', '2' ) },
+ { VIDEO_PALETTE_YUV422, VLC_FOURCC( 'Y', 'U', 'Y', '2' ) },
+ { VIDEO_PALETTE_YUV422, VLC_FOURCC( 'Y', 'U', 'Y', 'V' ) },
+ { VIDEO_PALETTE_YUYV, VLC_FOURCC( 'Y', 'U', 'Y', '2' ) },
{ VIDEO_PALETTE_YUYV, VLC_FOURCC( 'Y', 'U', 'Y', 'V' ) },
{ VIDEO_PALETTE_UYVY, VLC_FOURCC( 'U', 'Y', 'V', 'Y' ) },
{ VIDEO_PALETTE_YUV420, VLC_FOURCC( 'I', '4', '2', 'N' ) },
float f_fps; /* <= 0.0 mean to grab at full rate */
mtime_t i_video_pts; /* only used when f_fps > 0 */
- vlc_bool_t b_mjpeg;
+ bool b_mjpeg;
int i_decimation;
int i_quality;
/* Audio properties */
vlc_fourcc_t i_acodec_raw;
int i_sample_rate;
- vlc_bool_t b_stereo;
+ bool b_stereo;
int i_audio_max_frame_size;
block_t *p_block_audio;
es_out_id_t *p_es_audio;
p_sys->fd_audio = OpenAudioDev( p_demux, p_sys->psz_device );
if( p_sys->fd_audio >= 0 )
{
- if( p_sys->psz_adev ) free( p_sys->psz_adev );
+ free( p_sys->psz_adev );
p_sys->psz_adev = p_sys->psz_device;
p_sys->psz_device = NULL;
}
}
else
{
- if( p_sys->psz_vdev ) free( p_sys->psz_vdev );
+ free( p_sys->psz_vdev );
p_sys->psz_vdev = p_sys->psz_device;
p_sys->psz_device = NULL;
}
{
if( !p_sys->psz_vdev || !*p_sys->psz_vdev )
{
- if( p_sys->psz_vdev ) free( p_sys->psz_vdev );
+ free( p_sys->psz_vdev );
p_sys->psz_vdev = var_CreateGetString( p_demux, "v4l-vdev" );;
}
{
if( !p_sys->psz_adev || !*p_sys->psz_adev )
{
- if( p_sys->psz_adev ) free( p_sys->psz_adev );
+ free( p_sys->psz_adev );
p_sys->psz_adev = var_CreateGetString( p_demux, "v4l-adev" );;
}
demux_t *p_demux = (demux_t *)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
- if( p_sys->psz_device ) free( p_sys->psz_device );
- if( p_sys->psz_vdev ) free( p_sys->psz_vdev );
- if( p_sys->psz_adev ) free( p_sys->psz_adev );
+ free( p_sys->psz_device );
+ free( p_sys->psz_vdev );
+ free( p_sys->psz_adev );
if( p_sys->fd_video >= 0 ) close( p_sys->fd_video );
if( p_sys->fd_audio >= 0 ) close( p_sys->fd_audio );
if( p_sys->p_block_audio ) block_Release( p_sys->p_block_audio );
*****************************************************************************/
static int Control( demux_t *p_demux, int i_query, va_list args )
{
- vlc_bool_t *pb;
+ bool *pb;
int64_t *pi64;
switch( i_query )
{
/* Special for access_demux */
case DEMUX_CAN_PAUSE:
+ case DEMUX_CAN_SEEK:
case DEMUX_SET_PAUSE_STATE:
case DEMUX_CAN_CONTROL_PACE:
- pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
- *pb = VLC_FALSE;
+ pb = (bool*)va_arg( args, bool * );
+ *pb = false;
return VLC_SUCCESS;
case DEMUX_GET_PTS_DELAY:
}
else if( !strncmp( psz_parser, "hue=", strlen( "hue=" ) ) )
{
- p_sys->i_hue = strtol( psz_parser + strlen( "hue=" ),
+ p_sys->i_hue = strtol( psz_parser + strlen( "hue=" ),
&psz_parser, 0 );
}
else if( !strncmp( psz_parser, "contrast=", strlen( "contrast=" ) ) )
{
psz_parser += strlen( "stereo" );
- p_sys->b_stereo = VLC_TRUE;
+ p_sys->b_stereo = true;
}
else if( !strncmp( psz_parser, "mono", strlen( "mono" ) ) )
{
psz_parser += strlen( "mono" );
- p_sys->b_stereo = VLC_FALSE;
+ p_sys->b_stereo = false;
}
else if( !strncmp( psz_parser, "mjpeg", strlen( "mjpeg" ) ) )
{
psz_parser += strlen( "mjpeg" );
- p_sys->b_mjpeg = VLC_TRUE;
+ p_sys->b_mjpeg = true;
}
else if( !strncmp( psz_parser, "decimation=",
strlen( "decimation=" ) ) )
{
p_sys->psz_device = strdup( psz_dup );
}
- if( psz_dup ) free( psz_dup );
+ free( psz_dup );
}
/*****************************************************************************
if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
{
- msg_Err( p_demux, "cannot open device (%s)", strerror( errno ) );
+ msg_Err( p_demux, "cannot open device (%m)" );
goto vdev_failed;
}
if( ioctl( i_fd, VIDIOCGCAP, &p_sys->vid_cap ) < 0 )
{
- msg_Err( p_demux, "cannot get capabilities (%s)", strerror( errno ) );
+ msg_Err( p_demux, "cannot get capabilities (%m)" );
goto vdev_failed;
}
vid_channel.channel = p_sys->i_channel;
if( ioctl( i_fd, VIDIOCGCHAN, &vid_channel ) < 0 )
{
- msg_Err( p_demux, "cannot get channel infos (%s)",
- strerror( errno ) );
+ msg_Err( p_demux, "cannot get channel infos (%m)" );
goto vdev_failed;
}
msg_Dbg( p_demux,
vid_channel.norm = p_sys->i_norm;
if( ioctl( i_fd, VIDIOCSCHAN, &vid_channel ) < 0 )
{
- msg_Err( p_demux, "cannot set channel (%s)", strerror( errno ) );
+ msg_Err( p_demux, "cannot set channel (%m)" );
goto vdev_failed;
}
vid_tuner.tuner = p_sys->i_tuner;
if( ioctl( i_fd, VIDIOCGTUNER, &vid_tuner ) < 0 )
{
- msg_Err( p_demux, "cannot get tuner (%s)", strerror( errno ) );
+ msg_Err( p_demux, "cannot get tuner (%m)" );
goto vdev_failed;
}
msg_Dbg( p_demux, "tuner %s low=%d high=%d, flags=0x%x "
//vid_tuner.mode = p_sys->i_norm;
if( ioctl( i_fd, VIDIOCSTUNER, &vid_tuner ) < 0 )
{
- msg_Err( p_demux, "cannot set tuner (%s)", strerror( errno ) );
+ msg_Err( p_demux, "cannot set tuner (%m)" );
goto vdev_failed;
}
}
int driver_frequency = p_sys->i_frequency * 16 /1000;
if( ioctl( i_fd, VIDIOCSFREQ, &driver_frequency ) < 0 )
{
- msg_Err( p_demux, "cannot set frequency (%s)",
- strerror( errno ) );
+ msg_Err( p_demux, "cannot set frequency (%m)" );
goto vdev_failed;
}
msg_Dbg( p_demux, "frequency %d (%d)", p_sys->i_frequency,
vid_audio.audio = p_sys->i_audio;
if( ioctl( i_fd, VIDIOCGAUDIO, &vid_audio ) < 0 )
{
- msg_Err( p_demux, "cannot get audio (%s)", strerror( errno ) );
+ msg_Err( p_demux, "cannot get audio (%m)" );
goto vdev_failed;
}
if( ioctl( i_fd, VIDIOCSAUDIO, &vid_audio ) < 0 )
{
- msg_Err( p_demux, "cannot set audio (%s)", strerror( errno ) );
+ msg_Err( p_demux, "cannot set audio (%m)" );
goto vdev_failed;
}
}
if( ioctl( i_fd, MJPIOC_G_PARAMS, &mjpeg ) < 0 )
{
- msg_Err( p_demux, "cannot get mjpeg params (%s)",
- strerror( errno ) );
+ msg_Err( p_demux, "cannot get mjpeg params (%m)" );
goto vdev_failed;
}
mjpeg.input = p_sys->i_channel;
if( ioctl( i_fd, MJPIOC_S_PARAMS, &mjpeg ) < 0 )
{
- msg_Err( p_demux, "cannot set mjpeg params (%s)",
- strerror( errno ) );
+ msg_Err( p_demux, "cannot set mjpeg params (%m)" );
goto vdev_failed;
}
if( ioctl( i_fd, VIDIOCGWIN, &vid_win ) < 0 )
{
- msg_Err( p_demux, "cannot get win (%s)", strerror( errno ) );
+ msg_Err( p_demux, "cannot get win (%m)" );
goto vdev_failed;
}
p_sys->i_width = vid_win.width;
char *psz;
int i;
- vid_picture.palette = 0;
p_sys->i_fourcc = 0;
psz = var_CreateGetString( p_demux, "v4l-chroma" );
if( strlen( psz ) >= 4 )
{
+ vid_picture.palette = 0;
int i_chroma = VLC_FOURCC( psz[0], psz[1], psz[2], psz[3] );
/* Find out v4l chroma code */
if( (i_fd = open( psz_device, O_RDONLY | O_NONBLOCK )) < 0 )
{
- msg_Err( p_demux, "cannot open audio device (%s)", strerror( errno ) );
+ msg_Err( p_demux, "cannot open audio device (%m)" );
goto adev_fail;
}
|| i_format != AFMT_S16_LE )
{
msg_Err( p_demux, "cannot set audio format (16b little endian) "
- "(%s)", strerror( errno ) );
+ "(%m)" );
goto adev_fail;
}
if( ioctl( i_fd, SNDCTL_DSP_STEREO,
&p_sys->b_stereo ) < 0 )
{
- msg_Err( p_demux, "cannot set audio channels count (%s)",
- strerror( errno ) );
+ msg_Err( p_demux, "cannot set audio channels count (%m)" );
goto adev_fail;
}
if( ioctl( i_fd, SNDCTL_DSP_SPEED,
&p_sys->i_sample_rate ) < 0 )
{
- msg_Err( p_demux, "cannot set audio sample rate (%s)",
- strerror( errno ) );
+ msg_Err( p_demux, "cannot set audio sample rate (%m)" );
goto adev_fail;
}
- msg_Dbg( p_demux, "openened adev=`%s' %s %dHz",
+ msg_Dbg( p_demux, "opened adev=`%s' %s %dHz",
psz_device, p_sys->b_stereo ? "stereo" : "mono",
p_sys->i_sample_rate );
}
p_block->i_pts = p_block->i_dts =
- mdate() - I64C(1000000) * (mtime_t)i_correct /
+ mdate() - INT64_C(1000000) * (mtime_t)i_correct /
2 / ( p_sys->b_stereo ? 2 : 1) / p_sys->i_sample_rate;
return p_block;
return NULL;
}
- if( p_demux->b_die )
+ if( !vlc_object_alive (p_demux) )
{
return NULL;
}
while( ioctl(p_sys->fd_video, VIDIOCSYNC, &p_sys->i_frame_pos) < 0 )
{
- if( errno != EAGAIN && errno != EINTR )
+ if( errno != EAGAIN && errno != EINTR )
{
msg_Err( p_demux, "failed syncing new frame" );
return NULL;
/* sync on the next frame */
while( ioctl( p_sys->fd_video, MJPIOC_SYNC, &sync ) < 0 )
{
- if( errno != EAGAIN && errno != EINTR )
+ if( errno != EAGAIN && errno != EINTR )
{
msg_Err( p_demux, "failed syncing new frame" );
return NULL;
projects / vlc / blobdiff