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

fix error handling, fix deadlock , fix stream names

Browse Source
This commit is contained in:
niels
2015-11-13 22:29:04 +01:00
parent e5ff8e3e65
commit 8960b2d424
2 changed files with 56 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1879,6 +1879,7 @@ static void *v4l2_grabber_thread( void *v )
if(!v4l2_verify_file( i->file ) ) {
i->stop = 1;
unlock_(v);
veejay_msg(VEEJAY_MSG_ERROR, "v4l2: Not a device file: %s" , i->file );
pthread_exit(NULL);
return NULL;
@@ -1886,6 +1887,7 @@ static void *v4l2_grabber_thread( void *v )
v4l2info *v4l2 = v4l2open( i->file, i->channel, i->host_fmt, i->wid, i->hei, i->fps, i->norm );
if( v4l2 == NULL ) {
i->stop = 1;
veejay_msg(0, "v4l2: error opening v4l2 device '%s'",i->file );
unlock_(v);
pthread_exit(NULL);
@@ -1905,6 +1907,7 @@ static void *v4l2_grabber_thread( void *v )
for( j = 0; j < N_FRAMES; j ++ ) {
uint8_t *ptr = (uint8_t*) vj_malloc( sizeof(uint8_t) * RUP8(planes[0] * 4) );
if(!ptr) {
i->stop = 1;
veejay_msg(0, "v4l2: error allocating memory" );
unlock_(v);
pthread_exit(NULL);