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

set pixelformat from codec as fallback

Browse Source
This commit is contained in:
niels
2015-04-08 23:20:53 +02:00
parent 0647c0ff3e
commit 0e7444ccec
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -422,6 +422,12 @@ static int v4l2_enum_video_standards( v4l2info *v, char norm )
if (-1 == ioctl (v->fd, VIDIOC_S_STD, &std_id)) { if (-1 == ioctl (v->fd, VIDIOC_S_STD, &std_id)) {
veejay_msg(VEEJAY_MSG_WARNING, "v4l2: unable to set video standard: %s", strerror(errno)); veejay_msg(VEEJAY_MSG_WARNING, "v4l2: unable to set video standard: %s", strerror(errno));
if( errno == ENOTTY ) {
veejay_msg(VEEJAY_MSG_ERROR, "v4l2: probably your video input device does not support the requested format" );
return 0;
}
return 1;//@ show must go on return 1;//@ show must go on
} else { } else {
veejay_msg(VEEJAY_MSG_INFO,"v4l2: set video standard %s", v4l2_get_std(std_id)); veejay_msg(VEEJAY_MSG_INFO,"v4l2: set video standard %s", v4l2_get_std(std_id));
@@ -456,7 +462,6 @@ static void v4l2_enum_frame_sizes( v4l2info *v )
(fmtdesc.pixelformat >> 8 ) & 0xff, (fmtdesc.pixelformat >> 8 ) & 0xff,
(fmtdesc.pixelformat >> 16) & 0xff, (fmtdesc.pixelformat >> 16) & 0xff,
(fmtdesc.pixelformat >> 24) & 0xff ); (fmtdesc.pixelformat >> 24) & 0xff );
v->supported_pixel_formats[ v->n_pixel_formats ] = fmtdesc.pixelformat; v->supported_pixel_formats[ v->n_pixel_formats ] = fmtdesc.pixelformat;
v->n_pixel_formats = (v->n_pixel_formats + 1 ) % loop_limit; v->n_pixel_formats = (v->n_pixel_formats + 1 ) % loop_limit;
@@ -1197,6 +1202,7 @@ static int v4l2_pull_frame_intern( v4l2info *v )
if( length == 0 ) { //@ success if( length == 0 ) { //@ success
length = 1; length = 1;
} }
v->info->format = PIX_FMT_YUV420P;
} else } else
#endif #endif
if( v->is_jpeg == 2 ) { if( v->is_jpeg == 2 ) {
@@ -1218,6 +1224,9 @@ static int v4l2_pull_frame_intern( v4l2info *v )
v->info->stride[1] = v->picture->linesize[1]; v->info->stride[1] = v->picture->linesize[1];
v->info->stride[2] = v->picture->linesize[2]; v->info->stride[2] = v->picture->linesize[2];
v->info->format = v->picture->format; v->info->format = v->picture->format;
if(v->info->format == -1) {
v->info->format = v->c->pix_fmt;
}
} }
if( v->scaler == NULL ) if( v->scaler == NULL )