Ticket #4466: input-switching-v1.patch

linux/drivers/media/video/ivtv/ivtv-ioctl.c

@@ -932 +932 @@
 
         case VIDIOC_S_INPUT:{
                 int inp = *(int *)arg;
+                int restart = 0;
+                int restarts[IVTV_MAX_STREAMS];
 
                 if (inp < 0 || inp >= itv->nof_inputs)
                         return -EINVAL;
@@ -941 +943 @@
                         break;
                 }
                 if (atomic_read(&itv->capturing) > 0) {
-                        return -EBUSY;
+                        IVTV_DEBUG_INFO("We're doing an input switch "
+                                        "while capturing..\n");
+                        restart = ivtv_stop_all_captures_temp(itv,0,restarts);
                 }
                 IVTV_DEBUG_INFO("Changing input from %d to %d\n",
                                 itv->active_input, inp);
@@ -957 +961 @@
                 ivtv_video_set_io(itv);
                 ivtv_audio_set_io(itv);
                 ivtv_unmute(itv);
+
+                if (restart) {
+                        int ok = ivtv_restart_all_captures(itv, restarts);
+                        /* TODO handle errors */
+                }
+
                 break;
         }
 

linux/drivers/media/video/ivtv/ivtv-streams.c

@@ -709 +709 @@
         }
 }
 
+int ivtv_stop_all_captures_temp(struct ivtv *itv, int gop_end, int *stopped)
+{
+        int i;
+        int total = 0;
+
+        for (i = IVTV_MAX_STREAMS - 1; i >= 0; i--) {
+                struct ivtv_stream *s = &itv->streams[i];
+
+                stopped[i] = 0;
+
+                if (s->v4l2dev == NULL)
+                        continue;
+                if (test_bit(IVTV_F_S_STREAMING, &s->s_flags)) {
+                        stopped[i] = 1;
+                        total++;
+                        ivtv_stop_v4l2_encode_stream(s, gop_end);
+                }
+        }
+
+        return total;
+}
+
+int ivtv_restart_all_captures(struct ivtv *itv, int *stopped)
+{
+        int i;
+        int errors = 0;
+
+        for (i = IVTV_MAX_STREAMS - 1; i >= 0; i--) {
+                struct ivtv_stream *s = &itv->streams[i];
+
+                if (s->v4l2dev == NULL)
+                        continue;
+
+                if (!stopped[i])
+                        continue;
+
+                errors += (0 == ivtv_start_v4l2_encode_stream(s)) ? 0 : 1;
+        }
+
+        return errors;
+}
+
 int ivtv_stop_v4l2_encode_stream(struct ivtv_stream *s, int gop_end)
 {
         struct ivtv *itv = s->itv;

linux/drivers/media/video/ivtv/ivtv-streams.h

@@ -34 +34 @@
 void ivtv_stop_all_captures(struct ivtv *itv);
 int ivtv_passthrough_mode(struct ivtv *itv, int enable);
 
+int ivtv_stop_all_captures_temp(struct ivtv *itv, int gop_end, int *stopped);
+int ivtv_restart_all_captures(struct ivtv *itv, int *stopped);
+
 #endif