Ticket #2238: mythtv_v4l1-compat_mute_fix.diff

libs/libmythtv/NuppelVideoRecorder.cpp

@@ -1054 +1054 @@
         perror("VIDIOCGCHAN");
 
     // if channel has a audio then activate it
-    if (!skip_btaudio && (vchan.flags & VIDEO_VC_AUDIO) == VIDEO_VC_AUDIO) {
-        if (ioctl(fd, VIDIOCGAUDIO, &va)<0)
-            perror("VIDIOCGAUDIO");
+    // if (!skip_btaudio && (vchan.flags & VIDEO_VC_AUDIO) == VIDEO_VC_AUDIO) {
+    //v4l1 compat does not set VIDEO_VC_AUDIO so above will fail (eg. on saa7134).
+    if (!skip_btaudio && ioctl(fd, VIDIOCGAUDIO, &va) >= 0) {
 
         va.flags &= ~VIDEO_AUDIO_MUTE; // now this really has to work
 
@@ -1064 +1064 @@
 
         if (ioctl(fd, VIDIOCSAUDIO, &va) < 0)
             perror("VIDIOCSAUDIO");
+
         //if (ioctl(fd, VIDIOCSCHAN, &vchan) < 0)
         //    perror("VIDIOCSCHAN");
+    } else {
+        perror("VIDIOCGAUDIO");
     }
 
     if ((vc.type & VID_TYPE_MJPEG_ENCODER) && hardware_encode)