Commit aa90f1de authored by Aymeric Moizard's avatar Aymeric Moizard
Browse files

MPEG images are very slow: prefer YUYV

parent 0ef21a9a
...@@ -161,11 +161,6 @@ static int msv4l2_configure(V4l2State *s){ ...@@ -161,11 +161,6 @@ static int msv4l2_configure(V4l2State *s){
s->int_pix_fmt=V4L2_PIX_FMT_YUV420; s->int_pix_fmt=V4L2_PIX_FMT_YUV420;
ms_message("v4lv2: YUV420P choosen"); ms_message("v4lv2: YUV420P choosen");
break; break;
}else if (v4lv2_try_format(s,&fmt,V4L2_PIX_FMT_MJPEG)){
s->pix_fmt=MS_MJPEG;
s->int_pix_fmt=V4L2_PIX_FMT_MJPEG;
ms_message("v4lv2: MJPEG choosen");
break;
}else if (v4lv2_try_format(s,&fmt,V4L2_PIX_FMT_YUYV)){ }else if (v4lv2_try_format(s,&fmt,V4L2_PIX_FMT_YUYV)){
s->pix_fmt=MS_YUYV; s->pix_fmt=MS_YUYV;
s->int_pix_fmt=V4L2_PIX_FMT_YUYV; s->int_pix_fmt=V4L2_PIX_FMT_YUYV;
...@@ -176,6 +171,11 @@ static int msv4l2_configure(V4l2State *s){ ...@@ -176,6 +171,11 @@ static int msv4l2_configure(V4l2State *s){
s->int_pix_fmt=V4L2_PIX_FMT_RGB24; s->int_pix_fmt=V4L2_PIX_FMT_RGB24;
ms_message("v4lv2: RGB24 choosen"); ms_message("v4lv2: RGB24 choosen");
break; break;
}else if (v4lv2_try_format(s,&fmt,V4L2_PIX_FMT_MJPEG)){
s->pix_fmt=MS_MJPEG;
s->int_pix_fmt=V4L2_PIX_FMT_MJPEG;
ms_message("v4lv2: MJPEG choosen");
break;
}else{ }else{
ms_error("Could not find supported pixel format for %ix%i", s->vsize.width, s->vsize.height); ms_error("Could not find supported pixel format for %ix%i", s->vsize.width, s->vsize.height);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment