Ticket #1074: use_specified_webcam_resolution.patch

stream/tvi_v4l2.c

@@ -780 +780 @@
         return TVI_CONTROL_TRUE;
     case TVI_CONTROL_VID_CHK_WIDTH:
         return TVI_CONTROL_TRUE;
+    case TVI_CONTROL_VID_SET_WIDTH_HEIGHT: 
+        if (getfmt(priv) < 0) return TVI_CONTROL_FALSE; 
+        priv->format.fmt.pix.width = ((int *)arg)[0]; 
+        priv->format.fmt.pix.height = ((int *)arg)[1]; 
+        priv->format.fmt.pix.field = V4L2_FIELD_ANY; 
+        if (ioctl(priv->video_fd, VIDIOC_S_FMT, &priv->format) < 0) 
+          return TVI_CONTROL_FALSE; 
+        return TVI_CONTROL_TRUE; 
     case TVI_CONTROL_VID_SET_WIDTH:
         if (getfmt(priv) < 0) return TVI_CONTROL_FALSE;
         priv->format.fmt.pix.width = *(int *)arg;

stream/tv.c

@@ -439 +439 @@
 #endif
 
     /* limits on w&h are norm-dependent -- JM */
+    if (tvh->tv_param->width != -1 && tvh->tv_param->height != -1) { 
+      // first tell the driver both width and height, some drivers do not support setting them independently. 
+      int dim[2]; 
+      dim[0] = tvh->tv_param->width; dim[1] = tvh->tv_param->height; 
+      funcs->control(tvh->priv, TVI_CONTROL_VID_SET_WIDTH_HEIGHT, dim); 
+    } 
     /* set width */
     if (tvh->tv_param->width != -1)
     {

stream/tv.h

@@ -177 +177 @@
 #define TVI_CONTROL_VID_GET_GAIN        0x120
 
 /* TUNER controls */
+#define TVI_CONTROL_VID_SET_WIDTH_HEIGHT 0x121
 #define TVI_CONTROL_TUN_GET_FREQ        0x201
 #define TVI_CONTROL_TUN_SET_FREQ        0x202
 #define TVI_CONTROL_TUN_GET_TUNER       0x203   /* update priv->tuner struct for used input */