Skip to content

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

v4l2: privatize demux_sys_t 

In case of pure access:
 - use correct access_sys_t type,
 - remove unused parameters.
parent dde47d92
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 57 deletions
modules/access/v4l2/access.c
View file @ a1cd839e
......@@ -38,6 +38,19 @@
#include "v4l2.h"
struct access_sys_t
{
int fd;
uint32_t block_flags;
union
{
uint32_t bufc;
uint32_t blocksize;
};
struct buffer_t *bufv;
vlc_v4l2_ctrl_t *controls;
};
static block_t *AccessRead( access_t * );
static ssize_t AccessReadStream( access_t *, uint8_t *, size_t );
static int AccessControl( access_t *, int, va_list );
......@@ -49,10 +62,10 @@ int AccessOpen( vlc_object_t *obj )
access_InitFields( access );
demux_sys_t *sys = calloc( 1, sizeof( demux_sys_t ));
access_sys_t *sys = calloc (1, sizeof (*sys));
if( unlikely(sys == NULL) )
return VLC_ENOMEM;
access->p_sys = (access_sys_t *)sys;
access->p_sys = sys;
ParseMRL( obj, access->psz_location );
......@@ -84,7 +97,7 @@ int AccessOpen( vlc_object_t *obj )
goto error;
}
sys->i_fd = fd;
sys->fd = fd;
access->pf_seek = NULL;
access->pf_control = AccessControl;
return VLC_SUCCESS;
......@@ -95,7 +108,7 @@ error:
int InitVideo (access_t *access, int fd)
{
demux_sys_t *sys = (demux_sys_t *)access->p_sys;
access_sys_t *sys = access->p_sys;
/* Get device capabilites */
struct v4l2_capability cap;
......@@ -148,17 +161,17 @@ int InitVideo (access_t *access, int fd)
case V4L2_FIELD_INTERLACED:
msg_Dbg (access, "Interlacing setting: interleaved");
/*if (NTSC)
sys->i_block_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST;
sys->block_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST;
else*/
sys->i_block_flags = BLOCK_FLAG_TOP_FIELD_FIRST;
sys->block_flags = BLOCK_FLAG_TOP_FIELD_FIRST;
break;
case V4L2_FIELD_INTERLACED_TB:
msg_Dbg (access, "Interlacing setting: interleaved top bottom" );
sys->i_block_flags = BLOCK_FLAG_TOP_FIELD_FIRST;
sys->block_flags = BLOCK_FLAG_TOP_FIELD_FIRST;
break;
case V4L2_FIELD_INTERLACED_BT:
msg_Dbg (access, "Interlacing setting: interleaved bottom top" );
sys->i_block_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST;
sys->block_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST;
break;
default:
break;
......@@ -210,19 +223,19 @@ int InitVideo (access_t *access, int fd)
void AccessClose( vlc_object_t *obj )
{
access_t *access = (access_t *)obj;
demux_sys_t *sys = (demux_sys_t *)access->p_sys;
access_sys_t *sys = access->p_sys;
ControlsDeinit( obj, sys->controls );
v4l2_close( sys->i_fd );
v4l2_close (sys->fd);
free( sys );
}
static block_t *AccessRead( access_t *access )
{
demux_sys_t *sys = (demux_sys_t *)access->p_sys;
access_sys_t *sys = access->p_sys;
struct pollfd fd;
fd.fd = sys->i_fd;
fd.fd = sys->fd;
fd.events = POLLIN|POLLPRI;
fd.revents = 0;
......@@ -231,22 +244,22 @@ static block_t *AccessRead( access_t *access )
if( poll( &fd, 1, 500 ) <= 0 )
return NULL;
block_t *block = GrabVideo (VLC_OBJECT(access), sys->i_fd, sys->bufv);
block_t *block = GrabVideo (VLC_OBJECT(access), sys->fd, sys->bufv);
if( block != NULL )
{
block->i_pts = block->i_dts = mdate();
block->i_flags |= sys->i_block_flags;
block->i_flags |= sys->block_flags;
}
return block;
}
static ssize_t AccessReadStream( access_t *access, uint8_t *buf, size_t len )
{
demux_sys_t *sys = (demux_sys_t *)access->p_sys;
access_sys_t *sys = access->p_sys;
struct pollfd ufd;
int i_ret;
ufd.fd = sys->i_fd;
ufd.fd = sys->fd;
ufd.events = POLLIN;
if( access->info.b_eof )
......@@ -269,7 +282,7 @@ static ssize_t AccessReadStream( access_t *access, uint8_t *buf, size_t len )
return -1;
}
i_ret = v4l2_read( sys->i_fd, buf, len );
i_ret = v4l2_read (sys->fd, buf, len);
if( i_ret == 0 )
access->info.b_eof = true;
else if( i_ret > 0 )
......
modules/access/v4l2/demux.c
View file @ a1cd839e
......@@ -41,6 +41,32 @@
#include "v4l2.h"
/* TODO: remove this, use callbacks */
typedef enum {
IO_METHOD_READ=1,
IO_METHOD_MMAP,
} io_method;
struct demux_sys_t
{
int fd;
vlc_thread_t thread;
/* Video */
io_method io;
struct buffer_t *bufv;
union
{
uint32_t bufc;
uint32_t blocksize;
};
uint32_t block_flags;
es_out_id_t *es;
vlc_v4l2_ctrl_t *controls;
};
static void *StreamThread (void *);
static void *ReadThread (void *);
static int DemuxControl( demux_t *, int, va_list );
......@@ -85,7 +111,7 @@ int DemuxOpen( vlc_object_t *obj )
goto error;
}
sys->i_fd = fd;
sys->fd = fd;
sys->controls = ControlsInit (VLC_OBJECT(demux), fd);
demux->pf_demux = NULL;
demux->pf_control = DemuxControl;
......@@ -377,9 +403,9 @@ static int InitVideo (demux_t *demux, int fd)
case V4L2_FIELD_INTERLACED:
msg_Dbg (demux, "Interlacing setting: interleaved");
/*if (NTSC)
sys->i_block_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST;
sys->block_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST;
else*/
sys->i_block_flags = BLOCK_FLAG_TOP_FIELD_FIRST;
sys->block_flags = BLOCK_FLAG_TOP_FIELD_FIRST;
break;
case V4L2_FIELD_SEQ_TB:
msg_Dbg (demux, "Interlacing setting: sequential top bottom (TODO)");
......@@ -393,11 +419,11 @@ static int InitVideo (demux_t *demux, int fd)
break;
case V4L2_FIELD_INTERLACED_TB:
msg_Dbg (demux, "Interlacing setting: interleaved top bottom");
sys->i_block_flags = BLOCK_FLAG_TOP_FIELD_FIRST;
sys->block_flags = BLOCK_FLAG_TOP_FIELD_FIRST;
break;
case V4L2_FIELD_INTERLACED_BT:
msg_Dbg (demux, "Interlacing setting: interleaved bottom top");
sys->i_block_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST;
sys->block_flags = BLOCK_FLAG_BOTTOM_FIELD_FIRST;
break;
default:
msg_Warn (demux, "Interlacing setting: unknown type (%d)",
......@@ -424,7 +450,7 @@ static int InitVideo (demux_t *demux, int fd)
es_fmt.video.i_frame_rate_base);
msg_Dbg (demux, " aspect ratio: %u/%u", es_fmt.video.i_sar_num,
es_fmt.video.i_sar_den);
sys->p_es = es_out_Add (demux->out, &es_fmt);
sys->es = es_out_Add (demux->out, &es_fmt);
/* Init I/O method */
void *(*entry) (void *);
......@@ -479,7 +505,7 @@ void DemuxClose( vlc_object_t *obj )
{
demux_t *demux = (demux_t *)obj;
demux_sys_t *sys = demux->p_sys;
int fd = sys->i_fd;
int fd = sys->fd;
vlc_cancel (sys->thread);
vlc_join (sys->thread, NULL);
......@@ -505,7 +531,7 @@ void DemuxClose( vlc_object_t *obj )
v4l2_munmap (sys->bufv[i].start, sys->bufv[i].length);
}
enum v4l2_buf_type buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
v4l2_ioctl( sys->i_fd, VIDIOC_STREAMOFF, &buf_type );
v4l2_ioctl (fd, VIDIOC_STREAMOFF, &buf_type);
free (sys->bufv);
break;
}
......@@ -520,7 +546,7 @@ static void *StreamThread (void *data)
{
demux_t *demux = data;
demux_sys_t *sys = demux->p_sys;
int fd = sys->i_fd;
int fd = sys->fd;
struct pollfd ufd[1];
ufd[0].fd = fd;
......@@ -541,9 +567,9 @@ static void *StreamThread (void *data)
if (block != NULL)
{
block->i_pts = block->i_dts = mdate ();
block->i_flags |= sys->i_block_flags;
block->i_flags |= sys->block_flags;
es_out_Control (demux->out, ES_OUT_SET_PCR, block->i_pts);
es_out_Send (demux->out, sys->p_es, block);
es_out_Send (demux->out, sys->es, block);
}
vlc_restorecancel (canc);
}
......@@ -555,7 +581,7 @@ static void *ReadThread (void *data)
{
demux_t *demux = data;
demux_sys_t *sys = demux->p_sys;
int fd = sys->i_fd;
int fd = sys->fd;
struct pollfd ufd[1];
ufd[0].fd = fd;
......@@ -579,7 +605,7 @@ static void *ReadThread (void *data)
continue;
}
block->i_pts = block->i_dts = mdate ();
block->i_flags |= sys->i_block_flags;
block->i_flags |= sys->block_flags;
int canc = vlc_savecancel ();
ssize_t val = v4l2_read (fd, block->p_buffer, block->i_buffer);
......@@ -587,7 +613,7 @@ static void *ReadThread (void *data)
{
block->i_buffer = val;
es_out_Control (demux->out, ES_OUT_SET_PCR, block->i_pts);
es_out_Send (demux->out, sys->p_es, block);
es_out_Send (demux->out, sys->es, block);
}
else
block_Release (block);
......
modules/access/v4l2/v4l2.h
View file @ a1cd839e
......@@ -69,34 +69,8 @@ extern int (*v4l2_munmap) (void *, size_t);
#define CFG_PREFIX "v4l2-"
/* TODO: remove this, use callbacks */
typedef enum {
IO_METHOD_READ=1,
IO_METHOD_MMAP,
} io_method;
typedef struct vlc_v4l2_ctrl vlc_v4l2_ctrl_t;
/* TODO: move this to access.c and demux.c (separately) */
struct demux_sys_t
{
int i_fd;
vlc_thread_t thread;
/* Video */
io_method io;
struct buffer_t *bufv;
uint32_t bufc;
#define blocksize bufc /* HACK HACK */
uint32_t i_block_flags;
es_out_id_t *p_es;
vlc_v4l2_ctrl_t *controls;
};
struct buffer_t
{
void * start;
......
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