Commit aa40732b authored by Antoine Cellerier's avatar Antoine Cellerier

Add some extra debug. Fix compilation.

If people now have "RDS", "hardware frequency seeking" or "VBI capture" in their v4l2 output, please say so!
parent 9cf37a2c
...@@ -1115,9 +1115,13 @@ static int AccessOpen( vlc_object_t * p_this ) ...@@ -1115,9 +1115,13 @@ static int AccessOpen( vlc_object_t * p_this )
if( FindMainDevice( p_this, p_sys, false ) == VLC_SUCCESS) if( FindMainDevice( p_this, p_sys, false ) == VLC_SUCCESS)
{ {
if( p_sys->io == IO_METHOD_READ ) if( p_sys->io == IO_METHOD_READ )
{
ACCESS_SET_CALLBACKS( AccessReadStream, NULL, AccessControl, NULL ); ACCESS_SET_CALLBACKS( AccessReadStream, NULL, AccessControl, NULL );
}
else else
{
ACCESS_SET_CALLBACKS( NULL, AccessRead, AccessControl, NULL ); ACCESS_SET_CALLBACKS( NULL, AccessRead, AccessControl, NULL );
}
return VLC_SUCCESS; return VLC_SUCCESS;
} }
} }
...@@ -1128,9 +1132,13 @@ static int AccessOpen( vlc_object_t * p_this ) ...@@ -1128,9 +1132,13 @@ static int AccessOpen( vlc_object_t * p_this )
if( FindMainDevice( p_this, p_sys, false ) == VLC_SUCCESS ) if( FindMainDevice( p_this, p_sys, false ) == VLC_SUCCESS )
{ {
if( p_sys->io == IO_METHOD_READ ) if( p_sys->io == IO_METHOD_READ )
{
ACCESS_SET_CALLBACKS( AccessReadStream, NULL, AccessControl, NULL ); ACCESS_SET_CALLBACKS( AccessReadStream, NULL, AccessControl, NULL );
}
else else
{
ACCESS_SET_CALLBACKS( NULL, AccessRead, AccessControl, NULL ); ACCESS_SET_CALLBACKS( NULL, AccessRead, AccessControl, NULL );
}
return VLC_SUCCESS; return VLC_SUCCESS;
} }
...@@ -2395,19 +2403,25 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys, ...@@ -2395,19 +2403,25 @@ static bool ProbeVideoDev( vlc_object_t *p_obj, demux_sys_t *p_sys,
if( p_sys->io == IO_METHOD_AUTO ) if( p_sys->io == IO_METHOD_AUTO )
{ {
if( p_sys->dev_cap.capabilities & V4L2_CAP_STREAMING ) if( p_sys->dev_cap.capabilities & V4L2_CAP_STREAMING )
{
msg_Err(p_obj, "Set p_sys->io to MMAP" );
p_sys->io = IO_METHOD_MMAP; p_sys->io = IO_METHOD_MMAP;
}
else if( p_sys->dev_cap.capabilities & V4L2_CAP_READWRITE ) else if( p_sys->dev_cap.capabilities & V4L2_CAP_READWRITE )
{
msg_Err(p_obj, "Set p_sys->io to READ" );
p_sys->io = IO_METHOD_READ; p_sys->io = IO_METHOD_READ;
}
else else
msg_Err( p_obj, "No known I/O method supported" ); msg_Err( p_obj, "No known I/O method supported" );
} }
if( p_sys->dev_cap.capabilities & V4L2_CAP_RDS_CAPTURE )
msg_Dbg( p_obj, "device supports RDS" );
if( p_sys->dev_cap.capabilities & V4L2_CAP_HW_FREQ_SEEK )
msg_Dbg( p_obj, "device supports hardware frequency seeking" );
if( p_sys->dev_cap.capabilities & V4L2_CAP_VBI_CAPTURE )
msg_Dbg( p_obj, "device support raw VBI capture" );
if( p_sys->dev_cap.capabilities & V4L2_CAP_SLICED_VBI_CAPTURE )
msg_Dbg( p_obj, "device support sliced VBI capture" );
/* Now, enumerate all the video inputs. This is useless at the moment /* 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 since we have no way to present that info to the user except with
debug messages */ debug messages */
......
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