/* Compressed data types */
{ V4L2_PIX_FMT_MJPEG, VLC_CODEC_MJPG, 0, 0, 0 },
+ { V4L2_PIX_FMT_JPEG, VLC_CODEC_JPEG, 0, 0, 0 },
#if 0
- { V4L2_PIX_FMT_JPEG, VLC_FOURCC('J','P','E','G') },
{ V4L2_PIX_FMT_DV, VLC_FOURCC('?','?','?','?') },
{ V4L2_PIX_FMT_MPEG, VLC_FOURCC('?','?','?','?') },
#endif
static const __u32 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_BGR32, V4L2_PIX_FMT_MJPEG, V4L2_PIX_FMT_JPEG };
static const struct
{
*****************************************************************************/
static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
{
- demux_sys_t *p_sys = p_demux->p_sys;
- bool *pb;
- int64_t *pi64;
-
switch( i_query )
{
/* Special for access_demux */
case DEMUX_CAN_SEEK:
case DEMUX_SET_PAUSE_STATE:
case DEMUX_CAN_CONTROL_PACE:
- pb = (bool*)va_arg( args, bool * );
- *pb = false;
+ *va_arg( args, bool * ) = false;
return VLC_SUCCESS;
case DEMUX_GET_PTS_DELAY:
- pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = (int64_t)p_sys->i_cache * 1000;
+ *va_arg(args,int64_t *) = (int64_t)p_demux->p_sys->i_cache*1000;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
- pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = mdate();
+ *va_arg( args, int64_t * ) = mdate();
return VLC_SUCCESS;
/* TODO implement others */
*****************************************************************************/
static int AccessControl( access_t *p_access, int i_query, va_list args )
{
- bool *pb_bool;
- int64_t *pi_64;
demux_sys_t *p_sys = (demux_sys_t *) p_access->p_sys;
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;
+ *va_arg( args, bool* ) = false;
break;
/* */
case ACCESS_GET_PTS_DELAY:
- pi_64 = (int64_t*)va_arg( args, int64_t * );
- *pi_64 = (int64_t) p_sys->i_cache * 1000;
+ *va_arg(args,int64_t *) = (int64_t)p_sys->i_cache*1000;
break;
/* */
p_sys->i_width = fmt.fmt.pix.width;
p_sys->i_height = fmt.fmt.pix.height;
- /* Check interlacing */
if( v4l2_ioctl( i_fd, VIDIOC_G_FMT, &fmt ) < 0 ) {;}
+ /* Print extra info */
+ msg_Dbg( p_demux, "Driver requires at most %d bytes to store a complete image", fmt.fmt.pix.sizeimage );
+ /* Check interlacing */
switch( fmt.fmt.pix.field )
{
case V4L2_FIELD_NONE: