#include <vlc_plugin.h>
#include <vlc_access.h>
#include <vlc_charset.h>
+#include <vlc_fs.h>
#include <vlc_demux.h>
#include <vlc_input.h>
#define V4L2_DEFAULT "/dev/video0"
#define CFG_PREFIX "v4l2-"
+#ifdef HAVE_MAEMO
+# define DEFAULT_WIDTH 640
+# define DEFAULT_HEIGHT 492
+#endif
+
+#ifndef DEFAULT_WIDTH
+# define DEFAULT_WIDTH (-1)
+# define DEFAULT_HEIGHT (-1)
+#endif
+
vlc_module_begin ()
set_shortname( N_("Video4Linux2") )
set_description( N_("Video4Linux2 input") )
add_integer( CFG_PREFIX "io", IO_METHOD_AUTO, NULL, IOMETHOD_TEXT,
IOMETHOD_LONGTEXT, true )
change_integer_list( i_iomethod_list, psz_iomethod_list_text, NULL )
- add_integer( CFG_PREFIX "width", -1, NULL, WIDTH_TEXT,
+ add_integer( CFG_PREFIX "width", DEFAULT_WIDTH, NULL, WIDTH_TEXT,
WIDTH_LONGTEXT, true )
- add_integer( CFG_PREFIX "height", -1, NULL, HEIGHT_TEXT,
+ add_integer( CFG_PREFIX "height", DEFAULT_HEIGHT, NULL, HEIGHT_TEXT,
HEIGHT_LONGTEXT, true )
add_string( CFG_PREFIX "aspect-ratio", "4:3", NULL, ASPECT_TEXT,
ASPECT_LONGTEXT, true )
add_float( CFG_PREFIX "fps", 0, NULL, FPS_TEXT, FPS_LONGTEXT, true )
- add_integer( CFG_PREFIX "caching", DEFAULT_PTS_DELAY / 1000, NULL,
+ add_integer( CFG_PREFIX "caching", 50 /* ms */, NULL,
CACHING_TEXT, CACHING_LONGTEXT, true )
#ifdef HAVE_LIBV4L2
add_bool( CFG_PREFIX "use-libv4l2", false, NULL, LIBV4L2_TEXT, LIBV4L2_LONGTEXT, true );
*
* Try YUV chromas first, then RGB little endian and MJPEG as last resort.
*/
-static const __u32 p_chroma_fallbacks[] =
+static const uint32_t p_chroma_fallbacks[] =
{ V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_YVU420, V4L2_PIX_FMT_YUV422P,
V4L2_PIX_FMT_YUYV, V4L2_PIX_FMT_UYVY, V4L2_PIX_FMT_BGR24,
V4L2_PIX_FMT_BGR32, V4L2_PIX_FMT_MJPEG, V4L2_PIX_FMT_JPEG };
float f_fps; /* <= 0.0 mean to grab at full rate */
mtime_t i_video_pts; /* only used when f_fps > 0 */
int i_fourcc;
+ uint32_t i_block_flags;
es_out_id_t *p_es;
#ifdef HAVE_LIBV4L2
/* */
+ int (*pf_open)(const char *, int, ...);
int (*pf_close)( int );
int (*pf_dup)( int );
int (*pf_ioctl)( int, unsigned long int, ... );
#ifdef HAVE_LIBV4L2
static void use_kernel_v4l2( demux_sys_t *p_sys )
{
+ p_sys->pf_open = vlc_open;
p_sys->pf_close = close;
p_sys->pf_dup = dup;
p_sys->pf_ioctl = ioctl;
static void use_libv4l2( demux_sys_t *p_sys )
{
+ p_sys->pf_open = v4l2_open;
p_sys->pf_close = v4l2_close;
p_sys->pf_dup = v4l2_dup;
p_sys->pf_ioctl = v4l2_ioctl;
p_sys->b_libv4l2 = true;
}
+# define v4l2_open (p_sys->pf_open)
# define v4l2_close (p_sys->pf_close)
# define v4l2_dup (p_sys->pf_dup)
# define v4l2_ioctl (p_sys->pf_ioctl)
# define v4l2_mmap (p_sys->pf_mmap)
# define v4l2_munmap (p_sys->pf_munmap)
#else
+# define v4l2_open vlc_open
# define v4l2_close close
# define v4l2_dup dup
# define v4l2_ioctl ioctl
ParseMRL( p_sys, p_demux->psz_path, (vlc_object_t *) p_demux );
#ifdef HAVE_LIBV4L2
- if( !config_GetInt( p_this, CFG_PREFIX "use-libv4l2" ) )
+ if( !var_InheritInteger( p_this, CFG_PREFIX "use-libv4l2" ) )
{
msg_Dbg( p_this, "Trying direct kernel v4l2" );
use_kernel_v4l2( p_sys );
p_sys->psz_set_ctrls = var_CreateGetString( p_obj, "v4l2-set-ctrls" );
char *psz_aspect = var_CreateGetString( p_obj, "v4l2-aspect-ratio" );
- if( psz_aspect && *psz_aspect && strchr( psz_aspect, ':' ) )
+ char *psz_delim = !EMPTY_STR(psz_aspect) ? strchr( psz_aspect, ':' ) : NULL;
+ if( psz_delim )
{
- char *psz_delim = strchr( psz_aspect, ':' );
p_sys->i_aspect = atoi( psz_aspect ) * VOUT_ASPECT_FACTOR / atoi( psz_delim + 1 );
}
else
ParseMRL( p_sys, p_access->psz_path, (vlc_object_t *) p_access );
#ifdef HAVE_LIBV4L2
- if( !config_GetInt( p_this, CFG_PREFIX "use-libv4l2" ) )
+ if( !var_InheritInteger( p_this, CFG_PREFIX "use-libv4l2" ) )
{
msg_Dbg( p_this, "Trying direct kernel v4l2" );
use_kernel_v4l2( p_sys );
/* Timestamp */
p_sys->i_video_pts = p_block->i_pts = p_block->i_dts = mdate();
+ p_block->i_flags |= p_sys->i_block_flags;
return p_block;
}
const char *psz_device = p_sys->psz_device;
es_format_t es_fmt;
- if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
+ if( ( i_fd = v4l2_open( psz_device, O_RDWR ) ) < 0 )
{
msg_Err( p_obj, "cannot open device (%m)" );
goto open_failed;
memset( &fmt, 0, sizeof(fmt) );
fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- if( p_sys->i_width == 0 || p_sys->i_height == 0 )
+ if( p_sys->i_width <= 0 || p_sys->i_height <= 0 )
{
/* Use current width and height settings */
if( v4l2_ioctl( i_fd, VIDIOC_G_FMT, &fmt ) < 0 )
goto open_failed;
}
- p_sys->i_width = fmt.fmt.pix.width;
- p_sys->i_height = fmt.fmt.pix.height;
+ msg_Dbg( p_obj, "found default width and height of %ux%u",
+ fmt.fmt.pix.width, fmt.fmt.pix.height );
- if( fmt.fmt.pix.field == V4L2_FIELD_ALTERNATE )
+ if( p_sys->i_width < 0 || p_sys->i_height < 0 )
{
- p_sys->i_height = p_sys->i_height * 2;
+ msg_Dbg( p_obj, "will try to find optimal width and height." );
}
}
- else if( p_sys->i_width < 0 || p_sys->i_height < 0 )
- {
- msg_Dbg( p_obj, "will try to find optimal width and height." );
- }
else
{
/* Use user specified width and height */
msg_Dbg( p_obj, "trying specified size %dx%d", p_sys->i_width, p_sys->i_height );
+ fmt.fmt.pix.width = p_sys->i_width;
+ fmt.fmt.pix.height = p_sys->i_height;
}
- fmt.fmt.pix.width = __MAX(0, p_sys->i_width);
- fmt.fmt.pix.height = __MAX(0, p_sys->i_height);
fmt.fmt.pix.field = V4L2_FIELD_NONE;
if (b_demux)
&i_width, &i_height );
if( i_width || i_height )
{
- msg_Dbg( p_demux, "Found optimal dimensions for framerate %f of %dx%d",
- p_sys->f_fps, i_width, i_height );
+ msg_Dbg( p_demux, "Found optimal dimensions for framerate %f "
+ "of %ux%u", p_sys->f_fps, i_width, i_height );
fmt.fmt.pix.width = i_width;
fmt.fmt.pix.height = i_height;
- if( v4l2_ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 ) {;}
+ if( v4l2_ioctl( i_fd, VIDIOC_S_FMT, &fmt ) < 0 )
+ {
+ msg_Err( p_obj, "Cannot set size to optimal dimensions "
+ "%ux%u", i_width, i_height );
+ goto open_failed;
+ }
}
else
{
- msg_Warn( p_obj, "Could not find optimal width and height." );
+ msg_Warn( p_obj, "Could not find optimal width and height, "
+ "falling back to driver default." );
}
}
-
- /* Reassign width, height and chroma incase driver override */
- p_sys->i_width = fmt.fmt.pix.width;
- p_sys->i_height = fmt.fmt.pix.height;
}
+ p_sys->i_width = fmt.fmt.pix.width;
+ p_sys->i_height = fmt.fmt.pix.height;
+
if( v4l2_ioctl( i_fd, VIDIOC_G_FMT, &fmt ) < 0 ) {;}
/* Print extra info */
msg_Dbg( p_obj, "Driver requires at most %d bytes to store a complete image", fmt.fmt.pix.sizeimage );
break;
case V4L2_FIELD_INTERLACED:
msg_Dbg( p_obj, "Interlacing setting: interleaved (bottom top if M/NTSC, top bottom otherwise)" );
+ if( p_sys->i_selected_standard_id == V4L2_STD_NTSC )
+ p_sys->i_block_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST;
+ else
+ p_sys->i_block_flags = BLOCK_FLAG_TOP_FIELD_FIRST;
break;
case V4L2_FIELD_SEQ_TB:
- msg_Dbg( p_obj, "Interlacing setting: sequential top bottom" );
+ msg_Dbg( p_obj, "Interlacing setting: sequential top bottom (TODO)" );
break;
case V4L2_FIELD_SEQ_BT:
- msg_Dbg( p_obj, "Interlacing setting: sequential bottom top" );
+ msg_Dbg( p_obj, "Interlacing setting: sequential bottom top (TODO)" );
break;
case V4L2_FIELD_ALTERNATE:
- msg_Dbg( p_obj, "Interlacing setting: alternate fields" );
+ msg_Dbg( p_obj, "Interlacing setting: alternate fields (TODO)" );
+ p_sys->i_height = p_sys->i_height * 2;
break;
case V4L2_FIELD_INTERLACED_TB:
msg_Dbg( p_obj, "Interlacing setting: interleaved top bottom" );
+ p_sys->i_block_flags = BLOCK_FLAG_TOP_FIELD_FIRST;
break;
case V4L2_FIELD_INTERLACED_BT:
msg_Dbg( p_obj, "Interlacing setting: interleaved bottom top" );
+ p_sys->i_block_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST;
break;
default:
msg_Warn( p_obj, "Interlacing setting: unknown type (%d)",
fmt.fmt.pix.field );
break;
}
- if( fmt.fmt.pix.field != V4L2_FIELD_NONE )
- msg_Warn( p_obj, "Interlaced inputs haven't been tested. Please report any issue." );
/* Look up final fourcc */
p_sys->i_fourcc = 0;
char psz_fourcc[5];
memset( &psz_fourcc, 0, sizeof( psz_fourcc ) );
vlc_fourcc_to_char( p_sys->i_fourcc, &psz_fourcc );
- msg_Dbg( p_obj, "supported frame intervals for %4s, %dx%d:",
+ msg_Dbg( p_obj, "supported frame intervals for %4.4s, %dx%d:",
psz_fourcc, frmival.width, frmival.height );
switch( frmival.type )
{
es_fmt.video.i_height = p_sys->i_height;
/* Get aspect-ratio */
- es_fmt.video.i_aspect = p_sys->i_aspect;
+ es_fmt.video.i_sar_num = p_sys->i_aspect * es_fmt.video.i_height;
+ es_fmt.video.i_sar_den = VOUT_ASPECT_FACTOR * es_fmt.video.i_width;
demux_t *p_demux = (demux_t *) p_obj;
msg_Dbg( p_demux, "added new video es %4.4s %dx%d",
int i_fd;
- if( ( i_fd = open( psz_device, O_RDWR ) ) < 0 )
+ if( ( i_fd = v4l2_open( psz_device, O_RDWR ) ) < 0 )
{
msg_Err( p_obj, "cannot open video device '%s' (%m)", psz_device );
goto open_failed;
p_sys->dev_cap.version & 0xFF,
p_sys->dev_cap.bus_info );
- msg_Dbg( p_obj, "the device has the capabilities: (%c) Video Capure, "
+ msg_Dbg( p_obj, "the device has the capabilities: (%c) Video Capture, "
"(%c) Audio, "
"(%c) Tuner, "
"(%c) Radio",
if( p_sys->dev_cap.capabilities & V4L2_CAP_HW_FREQ_SEEK )
msg_Dbg( p_obj, "device supports hardware frequency seeking" );
#endif
-
if( p_sys->dev_cap.capabilities & V4L2_CAP_VBI_CAPTURE )
- msg_Dbg( p_obj, "device support raw VBI capture" );
+ msg_Dbg( p_obj, "device supports raw VBI capture" );
if( p_sys->dev_cap.capabilities & V4L2_CAP_SLICED_VBI_CAPTURE )
- msg_Dbg( p_obj, "device support sliced VBI capture" );
+ msg_Dbg( p_obj, "device supports sliced VBI capture" );
/* Now, enumerate all the video inputs. This is useless at the moment
since we have no way to present that info to the user except with
memset( &psz_fourcc, 0, sizeof( psz_fourcc ) );
vlc_fourcc_to_char( v4l2chroma_to_fourcc[i].i_fourcc,
&psz_fourcc );
- msg_Dbg( p_obj, "device supports chroma %4s [%s, %s]",
+ msg_Dbg( p_obj, "device supports chroma %4.4s [%s, %s]",
psz_fourcc,
p_sys->p_codecs[i_index].description,
psz_fourcc_v4l2 );
if( !b_codec_supported )
{
msg_Dbg( p_obj,
- "device codec %4s (%s) not supported",
+ "device codec %4.4s (%s) not supported",
psz_fourcc_v4l2,
p_sys->p_codecs[i_index].description );
}
projects / vlc / blobdiff