eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-16 12:50:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

added VEEJAY_V4L2_NO_THREADING environment var to entirely disable threaded capture

Browse Source 
fixed grey scale support
fixed mutex initialization (oops)
This commit is contained in:
niels
2011-04-10 23:41:58 +02:00
parent 8af7e6024b
commit 817373cc57
2 changed files with 65 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
veejay-current/veejay-server/libstream/v4l2utils.c
View File

@@ -123,14 +123,21 @@ typedef struct
int processed_buffer; int processed_buffer;
int allinthread; int allinthread;
int grey; int grey;
int threaded;
} v4l2info; } v4l2info;
static void lock_( v4l2_thread_info *i ) { static void lock_( v4l2_thread_info *i ) {
pthread_mutex_lock(&(i->mutex)); int res = pthread_mutex_lock(&(i->mutex));
if( res < 0 ) {
veejay_msg(0, "v4l2: lock error %s", strerror(errno));
}
} }
static void unlock_(v4l2_thread_info *i) { static void unlock_(v4l2_thread_info *i) {
pthread_mutex_unlock(&(i->mutex)); int res = pthread_mutex_unlock(&(i->mutex));
if( res < 0 ) {
veejay_msg(0, "v4l2: unlock error %s",strerror(errno));
}
} }
static int vioctl( int fd, int request, void *arg ) static int vioctl( int fd, int request, void *arg )
@@ -420,7 +427,7 @@ static int v4l2_try_pix_format( v4l2info *v, int pixelformat, int wid, int hei,
if( vioctl( v->fd, VIDIOC_TRY_FMT, &format ) != -1 ) { if( vioctl( v->fd, VIDIOC_TRY_FMT, &format ) != -1 ) {
veejay_msg(VEEJAY_MSG_WARNING, "v4l2: format %s not supported ... ", veejay_msg(VEEJAY_MSG_WARNING, "v4l2: format %s not supported by capture card... ",
(char*) &v4l2_pixel_format); (char*) &v4l2_pixel_format);
veejay_msg(VEEJAY_MSG_DEBUG, "v4l2: testing palette %4.4s (%dx%d)", veejay_msg(VEEJAY_MSG_DEBUG, "v4l2: testing palette %4.4s (%dx%d)",
@@ -540,7 +547,7 @@ static int v4l2_try_pix_format( v4l2info *v, int pixelformat, int wid, int hei,
static void v4l2_set_output_pointers( v4l2info *v, void *src ) static void v4l2_set_output_pointers( v4l2info *v, void *src )
{ {
uint8_t *map = (uint8_t*) src; uint8_t *map = (uint8_t*) src;
//@A
if( v->planes[0] > 0 ) { if( v->planes[0] > 0 ) {
v->info->data[0] = map; v->info->data[0] = map;
} }
@@ -557,9 +564,13 @@ static void v4l2_set_output_pointers( v4l2info *v, void *src )
VJFrame *v4l2_get_dst( void *vv, uint8_t *Y, uint8_t *U, uint8_t *V ) { VJFrame *v4l2_get_dst( void *vv, uint8_t *Y, uint8_t *U, uint8_t *V ) {
v4l2info *v = (v4l2info*) vv; v4l2info *v = (v4l2info*) vv;
if(v->threaded)
lock_(v->video_info);
v->buffer_filled->data[0] = Y; v->buffer_filled->data[0] = Y;
v->buffer_filled->data[1] = U; v->buffer_filled->data[1] = U;
v->buffer_filled->data[2] = V; v->buffer_filled->data[2] = V;
if(v->threaded)
unlock_(v->video_info);
return v->buffer_filled; return v->buffer_filled;
} }
@@ -573,15 +584,12 @@ static int v4l2_channel_choose( v4l2info *v, const int pref_channel )
for ( i = 0; i < (pref_channel+1); i ++ ) { for ( i = 0; i < (pref_channel+1); i ++ ) {
if( -1 == vioctl( v->fd, VIDIOC_S_INPUT, &i )) { if( -1 == vioctl( v->fd, VIDIOC_S_INPUT, &i )) {
#ifdef STRICT_CHECKING #ifdef STRICT_CHECKING
veejay_msg(VEEJAY_MSG_DEBUG, "Input channel %d does not exist", i); veejay_msg(VEEJAY_MSG_DEBUG, "v4l2: input channel %d does not exist", i);
#endif #endif
if( errno == EINVAL ) if( errno == EINVAL )
continue; continue;
return 0; return 0;
} else { } else {
#ifdef STRICT_CHECKING
veejay_msg(VEEJAY_MSG_DEBUG, "Input channel %d is valid.",i);
#endif
if(pref_channel==i) if(pref_channel==i)
pref_ok = 1; pref_ok = 1;
else else
@@ -650,7 +658,7 @@ void *v4l2open ( const char *file, const int input_channel, int host_fmt, int wi
} }
char *flt = getenv( "VEEJAY_V4L2_ALL_IN_THREAD" ); char *flt = getenv( "VEEJAY_V4L2_ALL_IN_THREAD" );
int flti = 0; int flti = 1; //@ on by default
if( flt ) { if( flt ) {
flti = atoi(flt); flti = atoi(flt);
} }
@@ -670,6 +678,8 @@ void *v4l2open ( const char *file, const int input_channel, int host_fmt, int wi
v->buffer_filled = yuv_yuv_template( NULL,NULL,NULL,wid,hei,host_fmt ); v->buffer_filled = yuv_yuv_template( NULL,NULL,NULL,wid,hei,host_fmt );
} }
veejay_msg(VEEJAY_MSG_INFO, "v4l2: output in %s", av_pix_fmt_descriptors[ v->buffer_filled->format ] );
if( -1 == vioctl( fd, VIDIOC_QUERYCAP, &(v->capability) ) ) { if( -1 == vioctl( fd, VIDIOC_QUERYCAP, &(v->capability) ) ) {
veejay_msg(0, "v4l2: VIDIOC_QUERYCAP failed with %s", strerror(errno)); veejay_msg(0, "v4l2: VIDIOC_QUERYCAP failed with %s", strerror(errno));
free(v); free(v);
@@ -1013,10 +1023,18 @@ int v4l2_pull_frame(void *vv,VJFrame *dst)
v4l2info *v = (v4l2info*) vv; v4l2info *v = (v4l2info*) vv;
if( v->scaler == NULL ) { if( v->scaler == NULL ) {
int tmp = dst->format;
sws_template templ; sws_template templ;
memset(&templ,0,sizeof(sws_template)); memset(&templ,0,sizeof(sws_template));
templ.flags = yuv_which_scaler(); templ.flags = yuv_which_scaler();
if( v->grey ) {
dst->format = PIX_FMT_GRAY8;
}
v->scaler = yuv_init_swscaler( v->info,dst, &templ, yuv_sws_get_cpu_flags() ); v->scaler = yuv_init_swscaler( v->info,dst, &templ, yuv_sws_get_cpu_flags() );
if( v->grey ) {
dst->format = tmp;
}
} }
if( v->rw == 0 ) { if( v->rw == 0 ) {
@@ -1072,13 +1090,7 @@ int v4l2_pull_frame(void *vv,VJFrame *dst)
} }
if( length > 0 ) { if( length > 0 ) {
int cf = dst->format;
if( v->grey ) {
dst->format = PIX_FMT_GRAY8;
}
yuv_convert_and_scale( v->scaler, v->info, dst ); yuv_convert_and_scale( v->scaler, v->info, dst );
if( v->grey)
dst->format = cf;
} }
if(!v->rw) { if(!v->rw) {
if( -1 == vioctl( v->fd, VIDIOC_QBUF, &(v->buffer))) { if( -1 == vioctl( v->fd, VIDIOC_QBUF, &(v->buffer))) {
@@ -1660,7 +1672,7 @@ static void *v4l2_grabber_thread( void *v )
i->v4l2 = v4l2; i->v4l2 = v4l2;
v4l2->video_info = i; v4l2->video_info = i;
v4l2->threaded = 1;
if(v4l2==NULL) { if(v4l2==NULL) {
unlock_(v); unlock_(v);
pthread_exit(NULL); pthread_exit(NULL);
@@ -1675,17 +1687,14 @@ static void *v4l2_grabber_thread( void *v )
veejay_msg(VEEJAY_MSG_INFO, "v4l2: output buffer is %d x %d", v4l2->buffer_filled->width,v4l2->buffer_filled->height); veejay_msg(VEEJAY_MSG_INFO, "v4l2: output buffer is %d x %d", v4l2->buffer_filled->width,v4l2->buffer_filled->height);
} }
veejay_msg(VEEJAY_MSG_INFO, "v4l2: image processing (scale/convert) in (%s)",
(v4l2->allinthread ? "thread" : "host" ));
veejay_msg(VEEJAY_MSG_INFO, "v4l2: capture format: %d x %d (%s)", veejay_msg(VEEJAY_MSG_INFO, "v4l2: capture format: %d x %d (%s)",
v4l2->info->width,v4l2->info->height, av_pix_fmt_descriptors[ v4l2->info->format ].name ); v4l2->info->width,v4l2->info->height, av_pix_fmt_descriptors[ v4l2->info->format ].name );
veejay_msg(VEEJAY_MSG_INFO, "v4l2: output format: %d x %d (%s)", veejay_msg(VEEJAY_MSG_INFO, "v4l2: output format: %d x %d (%s)",
v4l2->buffer_filled->width,v4l2->buffer_filled->height, av_pix_fmt_descriptors[v4l2->buffer_filled->format]); v4l2->buffer_filled->width,v4l2->buffer_filled->height, av_pix_fmt_descriptors[v4l2->buffer_filled->format]);
veejay_msg(VEEJAY_MSG_DEBUG, "v4l2: rw=%d, jpeg=%d, retries=%d", v4l2->rw, v4l2->is_jpeg, max_retries );
veejay_msg(VEEJAY_MSG_DEBUG, "v4l2: plane sizes input: %d, %d, %d, %d",
v4l2->planes[0],v4l2->planes[1],v4l2->planes[2],v4l2->planes[3]);
veejay_msg(VEEJAY_MSG_DEBUG, "v4l2: input frame c[0] = %d, c[1] = %d, c[2] = %d, [%dx%d][%dx%d]",
v4l2->info->len, v4l2->info->uv_len, v4l2->info->uv_len,
v4l2->info->width,v4l2->info->height, v4l2->info->uv_width, v4l2->info->uv_height );
i->grabbing = 1; i->grabbing = 1;
i->retries = max_retries; i->retries = max_retries;
@@ -1760,7 +1769,7 @@ int v4l2_thread_pull( v4l2_thread_info *i , VJFrame *dst )
templ.flags = yuv_which_scaler(); templ.flags = yuv_which_scaler();
v->scaler = yuv_init_swscaler( v->info,dst, &templ, yuv_sws_get_cpu_flags() ); v->scaler = yuv_init_swscaler( v->info,dst, &templ, yuv_sws_get_cpu_flags() );
} }
//@A
if( v->info->data[0] == NULL ) if( v->info->data[0] == NULL )
{ {
unlock_(i); unlock_(i);
@@ -1774,8 +1783,13 @@ int v4l2_thread_pull( v4l2_thread_info *i , VJFrame *dst )
yuv_convert_and_scale( v->scaler, v->info, dst ); yuv_convert_and_scale( v->scaler, v->info, dst );
} else { } else {
veejay_memcpy( dst->data[0], v->buffer_filled->data[0], v->planes[0]); veejay_memcpy( dst->data[0], v->buffer_filled->data[0], v->planes[0]);
if(!v->grey) {
veejay_memcpy( dst->data[1], v->buffer_filled->data[1], v->planes[1]); veejay_memcpy( dst->data[1], v->buffer_filled->data[1], v->planes[1]);
veejay_memcpy( dst->data[2], v->buffer_filled->data[2], v->planes[2]); veejay_memcpy( dst->data[2], v->buffer_filled->data[2], v->planes[2]);
} else {
veejay_memset( dst->data[1], 127, dst->uv_len );
veejay_memset( dst->data[2], 127, dst->uv_len );
}
} }
status = i->grabbing; status = i->grabbing;
@@ -1799,6 +1813,12 @@ void *v4l2_thread_new( char *file, int channel, int host_fmt, int wid, int hei,
i->fps = fps; i->fps = fps;
i->norm = norm; i->norm = norm;
pthread_mutexattr_t type;
pthread_mutexattr_init(&type);
pthread_mutexattr_settype(&type, PTHREAD_MUTEX_NORMAL);
pthread_mutex_init(&(i->mutex), &type);
if( v4l2_thread_start( i ) == 0 ) { if( v4l2_thread_start( i ) == 0 ) {
free(i->file); free(i->file);
free(i); free(i);

26
veejay-current/veejay-server/libstream/vj-tag.c
View File

@@ -76,6 +76,7 @@ static int video_driver_ = -1; // V4lUtils
static void *unicap_data_= NULL; static void *unicap_data_= NULL;
#endif #endif
//forward decl //forward decl
static int no_v4l2_threads_ = 0;
int _vj_tag_new_net(vj_tag *tag, int stream_nr, int w, int h,int f, char *host, int port, int p, int ty ); int _vj_tag_new_net(vj_tag *tag, int stream_nr, int w, int h,int f, char *host, int port, int p, int ty );
int _vj_tag_new_yuv4mpeg(vj_tag * tag, int stream_nr, editlist * el); int _vj_tag_new_yuv4mpeg(vj_tag * tag, int stream_nr, editlist * el);
@@ -322,6 +323,13 @@ int vj_tag_init(int width, int height, int pix_fmt, int video_driver)
#ifdef HAVE_V4L #ifdef HAVE_V4L
v4lvideo_templ_init(); v4lvideo_templ_init();
#endif #endif
char *v4l2threading = getenv( "VEEJAY_V4L2_NO_THREADING" );
if( v4l2threading ) {
no_v4l2_threads_ = atoi(v4l2threading);
}
return 0; return 0;
} }
@@ -431,10 +439,13 @@ int _vj_tag_new_unicap( vj_tag * tag, int stream_nr, int width, int height, int
veejay_msg(VEEJAY_MSG_DEBUG, "Using V4lutils from EffecTV"); veejay_msg(VEEJAY_MSG_DEBUG, "Using V4lutils from EffecTV");
#endif #endif
#ifdef HAVE_V4L2 #ifdef HAVE_V4L2
if( no_v4l2_threads_ ) {
vj_tag_input->unicap[stream_nr] = v4l2open( refname, channel, palette,width,height, vj_tag_input->unicap[stream_nr] = v4l2open( refname, channel, palette,width,height,
_tag_info->edit_list->video_fps,_tag_info->edit_list->video_norm ); _tag_info->edit_list->video_fps,_tag_info->edit_list->video_norm );
// vj_tag_input->unicap[stream_nr] = v4l2_thread_new( refname, channel,palette,width,height, } else {
// _tag_info->edit_list->video_fps,_tag_info->edit_list->video_norm ); vj_tag_input->unicap[stream_nr] = v4l2_thread_new( refname, channel,palette,width,height,
_tag_info->edit_list->video_fps,_tag_info->edit_list->video_norm );
}
if( !vj_tag_input->unicap[stream_nr] ) { if( !vj_tag_input->unicap[stream_nr] ) {
veejay_msg(0, "Unable to open device %d (%s)",device_num, refname ); veejay_msg(0, "Unable to open device %d (%s)",device_num, refname );
return 0; return 0;
@@ -3388,10 +3399,13 @@ int vj_tag_get_frame(int t1, uint8_t *buffer[3], uint8_t * abuffer)
int res = v4lvideo_copy_framebuffer_to(vj_tag_input->unicap[tag->index],buffer[0],buffer[1],buffer[2]); int res = v4lvideo_copy_framebuffer_to(vj_tag_input->unicap[tag->index],buffer[0],buffer[1],buffer[2]);
#endif #endif
#ifdef HAVE_V4L2 #ifdef HAVE_V4L2
int res = v4l2_pull_frame( vj_tag_input->unicap[tag->index],v4l2_get_dst(vj_tag_input->unicap[tag->index],buffer[0],buffer[1],buffer[2]) ); int res = 0;
/* if( no_v4l2_threads_ ) {
int res = v4l2_thread_pull( v4l2_thread_info_get( vj_tag_input->unicap[tag->index]), res = v4l2_pull_frame( vj_tag_input->unicap[tag->index],v4l2_get_dst(vj_tag_input->unicap[tag->index],buffer[0],buffer[1],buffer[2]) );
v4l2_get_dst( vj_tag_input->unicap[tag->index], buffer[0],buffer[1],buffer[2]));*/ } else {
res = v4l2_thread_pull( v4l2_thread_info_get( vj_tag_input->unicap[tag->index]),
v4l2_get_dst( vj_tag_input->unicap[tag->index], buffer[0],buffer[1],buffer[2]));
}
#endif #endif
if( res <= 0 ) { if( res <= 0 ) {
veejay_memset( buffer[0], 0, len ); veejay_memset( buffer[0], 0, len );