v4l2: fix encoded formats

spa/plugins/v4l2/v4l2-source.c

@@ -561,6 +561,7 @@ spa_v4l2_source_node_port_get_format (SpaNode          *node,
   SpaV4l2Source *this;
   SpaV4l2State *state;
   SpaPODBuilder b = { NULL, };
+  SpaPODFrame f;
 
   if (node == NULL || format == NULL)
     return SPA_RESULT_INVALID_ARGUMENTS;
@@ -578,8 +579,14 @@ spa_v4l2_source_node_port_get_format (SpaNode          *node,
   b.data = state->format_buffer;
   b.size = sizeof (state->format_buffer);
 
-  *format = SPA_MEMBER (b.data, spa_pod_builder_format (&b,
+  *format = SPA_POD_BUILDER_DEREF (&b, spa_pod_builder_push_format (&b, &f,
-         SPA_MEDIA_TYPE_VIDEO, SPA_MEDIA_SUBTYPE_RAW,
+                                           state->current_format.media_type,
+                                           state->current_format.media_subtype),
+                                   SpaFormat);
+
+  switch (state->current_format.media_subtype) {
+    case SPA_MEDIA_SUBTYPE_RAW:
+      spa_pod_builder_prop (&b,
            SPA_PROP_ID_VIDEO_FORMAT,    SPA_POD_TYPE_INT,
                                                 state->current_format.info.raw.format,
                                         SPA_POD_PROP_FLAG_READWRITE,
@@ -591,7 +598,45 @@ spa_v4l2_source_node_port_get_format (SpaNode          *node,
                                                 state->current_format.info.raw.framerate.num,
                                                 state->current_format.info.raw.framerate.denom,
                                         SPA_POD_PROP_FLAG_READWRITE,
-           0), SpaFormat);
+           0);
+      break;
+    case SPA_MEDIA_SUBTYPE_MJPG:
+    case SPA_MEDIA_SUBTYPE_JPEG:
+      spa_pod_builder_prop (&b,
+           SPA_PROP_ID_VIDEO_SIZE,      SPA_POD_TYPE_RECTANGLE,
+                                                state->current_format.info.mjpg.size.width,
+                                                state->current_format.info.mjpg.size.height,
+                                        SPA_POD_PROP_FLAG_READWRITE,
+           SPA_PROP_ID_VIDEO_FRAMERATE, SPA_POD_TYPE_FRACTION,
+                                                state->current_format.info.mjpg.framerate.num,
+                                                state->current_format.info.mjpg.framerate.denom,
+                                        SPA_POD_PROP_FLAG_READWRITE,
+           0);
+      break;
+    case SPA_MEDIA_SUBTYPE_H264:
+      spa_pod_builder_prop (&b,
+           SPA_PROP_ID_VIDEO_SIZE,      SPA_POD_TYPE_RECTANGLE,
+                                                state->current_format.info.h264.size.width,
+                                                state->current_format.info.h264.size.height,
+                                        SPA_POD_PROP_FLAG_READWRITE,
+           SPA_PROP_ID_VIDEO_FRAMERATE, SPA_POD_TYPE_FRACTION,
+                                                state->current_format.info.h264.framerate.num,
+                                                state->current_format.info.h264.framerate.denom,
+                                        SPA_POD_PROP_FLAG_READWRITE,
+           0);
+      break;
+    case SPA_MEDIA_SUBTYPE_DV:
+    case SPA_MEDIA_SUBTYPE_MPEGTS:
+    case SPA_MEDIA_SUBTYPE_MPEG1:
+    case SPA_MEDIA_SUBTYPE_MPEG2:
+    case SPA_MEDIA_SUBTYPE_MPEG4:
+    case SPA_MEDIA_SUBTYPE_XVID:
+    case SPA_MEDIA_SUBTYPE_VC1:
+    case SPA_MEDIA_SUBTYPE_VP8:
+    default:
+      return SPA_RESULT_NO_FORMAT;
+  }
+  spa_pod_builder_pop (&b, &f);
 
   return SPA_RESULT_OK;
 }

spa/plugins/v4l2/v4l2-utils.c

@@ -741,28 +741,62 @@ spa_v4l2_set_format (SpaV4l2Source *this, SpaVideoInfo *f, bool try_only)
   struct v4l2_format reqfmt, fmt;
   struct v4l2_streamparm streamparm;
   const FormatInfo *info = NULL;
+  SpaVideoFormat video_format;
+  SpaRectangle *size = NULL;
+  SpaFraction *framerate = NULL;
 
   CLEAR (fmt);
   CLEAR (streamparm);
   fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
   streamparm.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
+  switch (f->media_subtype) {
+    case SPA_MEDIA_SUBTYPE_RAW:
+      video_format = f->info.raw.format;
+      size = &f->info.raw.size;
+      framerate = &f->info.raw.framerate;
+      break;
+    case SPA_MEDIA_SUBTYPE_MJPG:
+    case SPA_MEDIA_SUBTYPE_JPEG:
+      video_format = SPA_VIDEO_FORMAT_ENCODED;
+      size = &f->info.mjpg.size;
+      framerate = &f->info.mjpg.framerate;
+      break;
+    case SPA_MEDIA_SUBTYPE_H264:
+      video_format = SPA_VIDEO_FORMAT_ENCODED;
+      size = &f->info.h264.size;
+      framerate = &f->info.h264.framerate;
+      break;
+    case SPA_MEDIA_SUBTYPE_DV:
+    case SPA_MEDIA_SUBTYPE_MPEGTS:
+    case SPA_MEDIA_SUBTYPE_MPEG1:
+    case SPA_MEDIA_SUBTYPE_MPEG2:
+    case SPA_MEDIA_SUBTYPE_MPEG4:
+    case SPA_MEDIA_SUBTYPE_XVID:
+    case SPA_MEDIA_SUBTYPE_VC1:
+    case SPA_MEDIA_SUBTYPE_VP8:
+    default:
+      video_format = SPA_VIDEO_FORMAT_ENCODED;
+      break;
+  }
+
   info = find_format_info_by_media_type (f->media_type,
                                          f->media_subtype,
-                                         f->info.raw.format,
+                                         video_format,
                                          0);
-  if (info == NULL) {
+  if (info == NULL || size == NULL || framerate == NULL) {
     spa_log_error (state->log, "v4l2: unknown media type %d %d %d", f->media_type,
-        f->media_subtype, f->info.raw.format);
+        f->media_subtype, video_format);
     return -1;
   }
 
+
   fmt.fmt.pix.pixelformat = info->fourcc;
   fmt.fmt.pix.field = V4L2_FIELD_ANY;
-  fmt.fmt.pix.width = f->info.raw.size.width;
+  fmt.fmt.pix.width = size->width;
-  fmt.fmt.pix.height = f->info.raw.size.height;
+  fmt.fmt.pix.height = size->height;
-  streamparm.parm.capture.timeperframe.numerator = f->info.raw.framerate.denom;
+  streamparm.parm.capture.timeperframe.numerator = framerate->denom;
-  streamparm.parm.capture.timeperframe.denominator = f->info.raw.framerate.num;
+  streamparm.parm.capture.timeperframe.denominator = framerate->num;
 
   spa_log_info (state->log, "v4l2: set %08x %dx%d %d/%d", fmt.fmt.pix.pixelformat,
       fmt.fmt.pix.width, fmt.fmt.pix.height,
@@ -797,10 +831,10 @@ spa_v4l2_set_format (SpaV4l2Source *this, SpaVideoInfo *f, bool try_only)
   if (try_only)
     return 0;
 
-  f->info.raw.size.width = fmt.fmt.pix.width;
+  size->width = fmt.fmt.pix.width;
-  f->info.raw.size.height = fmt.fmt.pix.height;
+  size->height = fmt.fmt.pix.height;
-  f->info.raw.framerate.num = streamparm.parm.capture.timeperframe.denominator;
+  framerate->num = streamparm.parm.capture.timeperframe.denominator;
-  f->info.raw.framerate.denom = streamparm.parm.capture.timeperframe.numerator;
+  framerate->denom = streamparm.parm.capture.timeperframe.numerator;
 
   state->fmt = fmt;
   state->info.flags = SPA_PORT_INFO_FLAG_CAN_ALLOC_BUFFERS |