V4L/DVB (5271): Add VIDIOC_TRY_ENCODER_CMD and VIDIOC_ENCODER_CMD ioctls.

Add support for starting, stopping, pausing and resuming an MPEG (or similar
compressed stream) encoder.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 27 insertions, 1 deletions

diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 2fe97c4cb35c..57aaed3239d6 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -374,7 +374,9 @@ static const char *v4l2_ioctls[] = {
 #if 1
         [_IOC_NR(VIDIOC_ENUM_FRAMESIZES)]  = "VIDIOC_ENUM_FRAMESIZES",
         [_IOC_NR(VIDIOC_ENUM_FRAMEINTERVALS)] = "VIDIOC_ENUM_FRAMEINTERVALS",
-        [_IOC_NR(VIDIOC_G_ENC_INDEX)]      = "VIDIOC_G_ENC_INDEX"
+        [_IOC_NR(VIDIOC_G_ENC_INDEX)]      = "VIDIOC_G_ENC_INDEX",
+        [_IOC_NR(VIDIOC_ENCODER_CMD)]      = "VIDIOC_ENCODER_CMD",
+        [_IOC_NR(VIDIOC_TRY_ENCODER_CMD)]  = "VIDIOC_TRY_ENCODER_CMD"
 #endif
 };
 #define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index cd13e6108e5e..011938fb7e0e 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -1354,6 +1354,30 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
                                         p->entries,p->entries_cap);
                 break;
         }
+        case VIDIOC_ENCODER_CMD:
+        {
+                struct v4l2_encoder_cmd *p=arg;
+
+                if (!vfd->vidioc_encoder_cmd)
+                        break;
+                ret=vfd->vidioc_encoder_cmd(file, fh, p);
+                if (!ret)
+                        dbgarg (cmd, "cmd=%d, flags=%d\n",
+                                        p->cmd,p->flags);
+                break;
+        }
+        case VIDIOC_TRY_ENCODER_CMD:
+        {
+                struct v4l2_encoder_cmd *p=arg;
+
+                if (!vfd->vidioc_try_encoder_cmd)
+                        break;
+                ret=vfd->vidioc_try_encoder_cmd(file, fh, p);
+                if (!ret)
+                        dbgarg (cmd, "cmd=%d, flags=%d\n",
+                                        p->cmd,p->flags);
+                break;
+        }
         case VIDIOC_G_PARM:
         {
                 struct v4l2_streamparm *p=arg;