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

fallback to read/write if mmap fails on v4l2loopback.

Browse Source
This commit is contained in:
niels
2013-02-12 21:08:56 +01:00
parent 36eb370c8b
commit bf48249a2a
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -888,7 +888,6 @@ void *v4l2open ( const char *file, const int input_channel, int host_fmt, int wi
} }
} else { } else {
veejay_msg(VEEJAY_MSG_DEBUG, "v4l2: Preferring mmap() capture, override with VEEJAY_V4L2_CAPTURE_METHOD=0"); veejay_msg(VEEJAY_MSG_DEBUG, "v4l2: Preferring mmap() capture, override with VEEJAY_V4L2_CAPTURE_METHOD=0");
can_read = 0;
cap_read = 1; cap_read = 1;
} }
} }
@@ -1007,9 +1006,11 @@ void *v4l2open ( const char *file, const int input_channel, int host_fmt, int wi
// munmap( v->buffer[k].start, v->buffer[k].length ); // munmap( v->buffer[k].start, v->buffer[k].length );
free(v->buffers); free(v->buffers);
free(v); //free(v);
close(fd); //close(fd);
return NULL; //return NULL;
v->rw = 1;
goto v4l2_rw_fallback;
} }
} }
@@ -1018,9 +1019,11 @@ void *v4l2open ( const char *file, const int input_channel, int host_fmt, int wi
if( v4l2_vidioc_qbuf( v ) == -1 ) { if( v4l2_vidioc_qbuf( v ) == -1 ) {
veejay_msg(0, "v4l2: VIDIOC_QBUF failed with:%d, %s", errno,strerror(errno)); veejay_msg(0, "v4l2: VIDIOC_QBUF failed with:%d, %s", errno,strerror(errno));
free(v->buffers); free(v->buffers);
free(v); // free(v);
close(fd); // close(fd);
return NULL; // return NULL;
v->rw = 1;
goto v4l2_rw_fallback;
} }
if( !v4l2_start_video_capture( v ) ) { if( !v4l2_start_video_capture( v ) ) {
@@ -1038,7 +1041,7 @@ void *v4l2open ( const char *file, const int input_channel, int host_fmt, int wi
free(v); free(v);
return NULL; return NULL;
} }
v->rw = 1;
goto v4l2_rw_fallback; goto v4l2_rw_fallback;
} else{ } else{
free(v->buffers); free(v->buffers);