Ticket #9825: 9825-v1.patch

mythtv/libs/libmythtv/NuppelVideoRecorder.cpp

@@ -87 +87 @@
 {
     channelObj = channel;
 
-    encoding = false;
     fd = -1;
     channelfd = -1;
     lf = tf = 0;
@@ -130 +129 @@
     text_buffer_count = 0;
     text_buffer_size = 0;
 
-    childrenLive = false;
-    errored = false;
-
-    recording = false;
-
     writepaused = false;
     audiopaused = false;
     mainpaused = false;
@@ -491 +485 @@
     return recording;
 }
 
-bool NuppelVideoRecorder::IsErrored(void)
-{
-    return errored;
-}
-
 long long NuppelVideoRecorder::GetFramesWritten(void)
 {
     return framesWritten;
@@ -748 +737 @@
         livetv = false;
         if (!ringBuffer->IsOpen())
         {
-            LOG(VB_GENERAL, LOG_ERR, LOC + "Could not open RingBuffer");
-            errored = true;
+            _error = "Could not open RingBuffer";
+            LOG(VB_GENERAL, LOG_ERR, LOC + _error);
             return;
         }
     }
@@ -992 +981 @@
     }
 }
 
-void NuppelVideoRecorder::StopRecording(void)
-{
-    encoding = false;
-    V4LRecorder::StopRecording();
-}
-
 void NuppelVideoRecorder::StreamAllocate(void)
 {
     strm = new signed char[width * height * 2 + 10];
@@ -1017 +1000 @@
         fd = open(vdevice.constData(), O_RDWR);
         if (retries++ > 5)
         {
-            LOG(VB_GENERAL, LOG_ERR, LOC +
-                QString("Can't open video device: %1").arg(videodevice));
-            LOG(VB_GENERAL, LOG_ERR, LOC + "open video: " + ENO);
+            _error = QString("Can't open video device: %1").arg(videodevice);
+            LOG(VB_GENERAL, LOG_ERR, LOC + _error + ENO);
             KillChildren();
-            errored = true;
             return false;
         }
     }
@@ -1072 +1053 @@
     if (lzo_init() != LZO_E_OK)
     {
         LOG(VB_GENERAL, LOG_ERR, LOC + "lzo_init() failed, exiting");
-        errored = true;
+        _error = "lzo_init() failed, exiting";
+        LOG(VB_GENERAL, LOG_ERR, LOC + _error);
         return;
     }
 
     if (!Open())
     {
-        errored = true;
+        _error = "Failed to open device";
+        LOG(VB_GENERAL, LOG_ERR, LOC + _error);
         return;
     }
 
@@ -1086 +1069 @@
 
     if (usingv4l2 && !SetFormatV4L2())
     {
-        errored = true;
+        _error = "Failed to set V4L2 format";
+        LOG(VB_GENERAL, LOG_ERR, LOC + _error);
         return;
     }
 
@@ -1112 +1096 @@
 
     if (CreateNuppelFile() != 0)
     {
-        LOG(VB_GENERAL, LOG_ERR, LOC + QString("Cannot open '%1' for writing")
-                .arg(ringBuffer->GetFilename()));
-        errored = true;
+        _error = QString("Cannot open '%1' for writing")
+            .arg(ringBuffer->GetFilename());
+        LOG(VB_GENERAL, LOG_ERR, LOC + _error);
         return;
     }
 
-    if (childrenLive)
+    if (IsHelperRequested())
     {
         LOG(VB_GENERAL, LOG_ERR, LOC + "Children are already alive");
-        errored = true;
+        _error = "Children are already alive";
         return;
     }
 
-    if (!SpawnChildren())
     {
-        LOG(VB_GENERAL, LOG_ERR, LOC + "Couldn't spawn children");
-        errored = true;
-        return;
+        QMutexLocker locker(&pauseLock);
+        request_recording = true;
+        request_helper = true;
+        recording = true;
+        recordingWait.wakeAll();
     }
 
+    write_thread = new NVRWriteThread(this);
+    write_thread->start();
+
+    audio_thread = new NVRAudioThread(this);
+    audio_thread->start();
+
+    if ((vbimode != VBIMode::None) && (OpenVBIDevice() >= 0))
+        vbi_thread = new VBIThread(this);
+
     // save the start time
     gettimeofday(&stm, &tzone);
 
@@ -1143 +1137 @@
         inpixfmt = FMT_NONE;
         InitFilters();
         DoV4L2();
-        return;
     }
     else
         DoV4L1();
+
+    {
+        QMutexLocker locker(&pauseLock);
+        request_recording = false;
+        request_helper = false;
+        recording = false;
+        recordingWait.wakeAll();
+    }
 }
 
 #ifdef USING_V4L1
@@ -1168 +1169 @@
 
     if (ioctl(fd, VIDIOCGCAP, &vc) < 0)
     {
-        LOG(VB_GENERAL, LOG_ERR, LOC + "VIDIOCGCAP: " + ENO);
+        QString tmp = "VIDIOCGCAP: " + ENO;
         KillChildren();
-        errored = true;
+        LOG(VB_GENERAL, LOG_ERR, tmp);
+        _error = tmp;
         return;
     }
 
@@ -1210 +1212 @@
     if ((vc.type & VID_TYPE_MJPEG_ENCODER) && hardware_encode)
     {
         DoMJPEG();
-        errored = true;
+        _error = "MJPEG requested but not available.";
+        LOG(VB_GENERAL, LOG_ERR, LOC + _error);
         return;
     }
 
@@ -1219 +1222 @@
 
     if (ioctl(fd, VIDIOCGMBUF, &vm) < 0)
     {
-        LOG(VB_GENERAL, LOG_ERR, LOC + "VIDIOCGMBUF: " +ENO);
+        QString tmp = "VIDIOCGMBUF: " + ENO;
         KillChildren();
-        errored = true;
+        LOG(VB_GENERAL, LOG_ERR, LOC + tmp);
+        _error = tmp;
         return;
     }
 
     if (vm.frames < 2)
     {
-        LOG(VB_GENERAL, LOG_ERR, LOC + "need a minimum of 2 capture buffers");
+        QString tmp = "need a minimum of 2 capture buffers";
         KillChildren();
-        errored = true;
+        LOG(VB_GENERAL, LOG_ERR, LOC + tmp);
+        _error = tmp;
         return;
     }
 
@@ -1241 +1246 @@
                                                fd, 0);
     if (buf <= 0)
     {
-        LOG(VB_GENERAL, LOG_ERR, LOC + "mmap: " + ENO);
+        QString tmp = "mmap: " + ENO;
         KillChildren();
-        errored = true;
+        LOG(VB_GENERAL, LOG_ERR, LOC + tmp);
+        _error = tmp;
         return;
     }
 
@@ -1261 +1267 @@
     if (ioctl(fd, VIDIOCMCAPTURE, &mm)<0)
         LOG(VB_GENERAL, LOG_ERR, LOC + "VIDIOCMCAPTUREi1: " + ENO);
 
-    encoding = true;
-    recording = true;
-
     int syncerrors = 0;
 
-    while (encoding)
+    while (IsRecordingRequested() && !IsErrored())
     {
         {
             QMutexLocker locker(&pauseLock);
@@ -1338 +1341 @@
 
     FinishRecording();
 
-    recording = false;
     close(fd);
 }
 #else // if !USING_V4L1
@@ -1487 +1489 @@
         comp.flags |= GO7007_COMP_CLOSED_GOP;
         if (ioctl(fd, GO7007IOC_S_COMP_PARAMS, &comp) < 0)
         {
-            LOG(VB_GENERAL, LOG_ERR, LOC + "Unable to set compression params");
-            errored = true;
+            _error = "Unable to set compression params";
+            LOG(VB_GENERAL, LOG_ERR, LOC + _error);
             return;
         }
 
@@ -1501 +1503 @@
 
         if (ioctl(fd, GO7007IOC_S_MPEG_PARAMS, &mpeg) < 0)
         {
-            LOG(VB_GENERAL, LOG_ERR, LOC + "Unable to set MPEG params");
-            errored = true;
+            _error = "Unable to set MPEG params";
+            LOG(VB_GENERAL, LOG_ERR, LOC + _error);
             return;
         }
 
@@ -1515 +1517 @@
 
         if (ioctl(fd, GO7007IOC_S_BITRATE, &usebitrate) < 0)
         {
-            LOG(VB_GENERAL, LOG_ERR, LOC + "Unable to set bitrate");
-            errored = true;
+            _error = "Unable to set bitrate";
+            LOG(VB_GENERAL, LOG_ERR, LOC + _error);
             return;
         }
 
@@ -1531 +1533 @@
 
     if (ioctl(fd, VIDIOC_REQBUFS, &vrbuf) < 0)
     {
-        LOG(VB_GENERAL, LOG_ERR, LOC +
-            "Not able to get any capture buffers, exiting");
-        errored = true;
+        _error = "Not able to get any capture buffers, exiting";
+        LOG(VB_GENERAL, LOG_ERR, LOC + _error);
         return;
     }
 
@@ -1558 +1559 @@
         {
             LOG(VB_GENERAL, LOG_ERR, LOC +
                 QString("unable to query capture buffer %1").arg(i));
-            errored = true;
+            _error = "Unable to query capture buffer";
             return;
         }
 
@@ -1569 +1570 @@
         if (buffers[i] == MAP_FAILED)
         {
             LOG(VB_GENERAL, LOG_ERR, LOC + "mmap: " + ENO);
-            LOG(VB_GENERAL, LOG_ERR, LOC + QString("Memory map failed"));
-            errored = true;
+            LOG(VB_GENERAL, LOG_ERR, LOC + "Memory map failed");
+            _error = "Memory map failed";
             return;
         }
         bufferlen[i] = vbuf.length;
@@ -1592 +1593 @@
     int frame = 0;
     bool forcekey = false;
 
-    encoding = true;
-    recording = true;
     resetcapture = false;
 
     // setup pixel format conversions for YUYV and UYVY
@@ -1610 +1609 @@
         output_buffer = (uint8_t*)av_malloc(height * width * 3 / 2);
         if (!output_buffer)
         {
-            LOG(VB_GENERAL, LOG_ERR, LOC +
-                "Cannot initialize image conversionbuffer");
-            errored = true;
+            _error = "Cannot initialize image conversion buffer";
+            LOG(VB_GENERAL, LOG_ERR, LOC + _error);
             return;
         }
 
@@ -1621 +1619 @@
                                            SWS_FAST_BILINEAR, NULL, NULL, NULL);
         if (!convert_ctx)
         {
-            LOG(VB_GENERAL, LOG_ERR, LOC +
-                "Cannot initialize image conversion context");
-            errored = true;
+            _error = "Cannot initialize image conversion context";
+            LOG(VB_GENERAL, LOG_ERR, LOC + _error);
             return;
         }
 
         avpicture_fill(&img_out, output_buffer, PIX_FMT_YUV420P, width, height);
     }
 
-    while (encoding) {
+    while (IsRecordingRequested() && !IsErrored())
+    {
 again:
         {
             QMutexLocker locker(&pauseLock);
@@ -1765 +1763 @@
     av_free(output_buffer);
     sws_freeContext(convert_ctx);
 
-    recording = false;
     close(fd);
     close(channelfd);
 }
@@ -1867 +1864 @@
             LOG(VB_GENERAL, LOG_ERR, LOC + "MJPIOC_QBUF_CAPT: " + ENO);
     }
 
-    encoding = true;
-    recording = true;
-
-    while (encoding)
+    while (IsRecordingRequested() && !IsErrored())
     {
         {
             QMutexLocker locker(&pauseLock);
@@ -1897 +1891 @@
         }
 
         if (ioctl(fd, MJPIOC_SYNC, &bsync) < 0)
-            encoding = false;
+        {
+            _error = "MJPEG sync error";
+            LOG(VB_GENERAL, LOG_ERR, LOC + _error + ENO);
+            break;
+        }
 
         BufferIt((unsigned char *)(MJPG_buff + bsync.frame * breq.size),
                  bsync.length);
 
         if (ioctl(fd, MJPIOC_QBUF_CAPT, &(bsync.frame)) < 0)
-            encoding = false;
+        {
+            _error = "MJPEG Capture error";
+            LOG(VB_GENERAL, LOG_ERR, LOC + _error + ENO);
+        }
     }
 
     munmap(MJPG_buff, breq.count * breq.size);
@@ -1911 +1912 @@
 
     FinishRecording();
 
-    recording = false;
     close(fd);
 }
 #else // if !USING_V4L1
 void NuppelVideoRecorder::DoMJPEG(void) {}
 #endif // !USING_V4L1
 
-bool NuppelVideoRecorder::SpawnChildren(void)
-{
-    childrenLive = true;
-
-    write_thread = new NVRWriteThread(this);
-    write_thread->start();
-
-    audio_thread = new NVRAudioThread(this);
-    audio_thread->start();
-
-    if ((vbimode != VBIMode::None) && (OpenVBIDevice() >= 0))
-        vbi_thread = new VBIThread(this);
-
-    return true;
-}
-
 void NuppelVideoRecorder::KillChildren(void)
 {
-    childrenLive = false;
     {
         QMutexLocker locker(&pauseLock);
+        request_helper = false;
         unpauseWait.wakeAll();
     }
 
@@ -2409 +2393 @@
     int act = 0, lastread = 0;
     audio_bytes_per_sample = audio_channels * audio_bits / 8;
 
-    while (childrenLive)
+    while (IsHelperRequested() && !IsErrored())
     {
         {
             QMutexLocker locker(&pauseLock);
@@ -2433 +2417 @@
             }
         }
 
+        if (!IsHelperRequested() || IsErrored())
+            break;
+
         lastread = audio_device->GetSamples(buffer, audio_buffer_size);
         if (audio_buffer_size != lastread)
         {
@@ -2696 +2683 @@
 
 void NuppelVideoRecorder::doWriteThread(void)
 {
-    while (childrenLive && !IsErrored())
+    while (IsHelperRequested() && !IsErrored())
     {
         {
             QMutexLocker locker(&pauseLock);
@@ -2720 +2707 @@
             }
         }
 
+        if (!IsHelperRequested() || IsErrored())
+            break;
+
         CheckForRingBufferSwitch();
 
         enum
@@ -3182 +3172 @@
         {
             LOG(VB_GENERAL, LOG_ERR, LOC +
                 QString("lame error '%1'").arg(lameret));
-            errored = true;
+            _error = QString("Audio Encoding Error '%1'")
+                .arg(lameret);
             return;
         }
         compressedsize = lameret;
@@ -3193 +3184 @@
         {
             LOG(VB_GENERAL, LOG_ERR, LOC +
                 QString("lame error '%1'").arg(lameret));
-            errored = true;
+            _error = QString("Audio Encoding Error '%1'")
+                .arg(lameret);
             return;
         }
         gaplesssize = lameret;

mythtv/libs/libmythtv/NuppelVideoRecorder.h

@@ -86 +86 @@
  
     void Initialize(void);
     void run(void);
-    void StopRecording(void); 
     
     virtual void Pause(bool clear = true);
     virtual bool IsPaused(bool holding_lock = false) const;
  
     bool IsRecording(void);
-    bool IsErrored(void);
 
     long long GetFramesWritten(void); 
 
@@ -142 +140 @@
 
     bool MJPEGInit(void);
  
-    bool SpawnChildren(void);
     void KillChildren(void);
     
     void BufferIt(unsigned char *buf, int len = -1, bool forcekey = false);
@@ -161 +158 @@
 
     void UpdateResolutions(void);
     
-    bool encoding;
-    
     int fd; // v4l input file handle
     signed char *strm;
     unsigned int lf, tf;
@@ -224 +219 @@
     struct timeval stm;
     struct timezone tzone;
 
-    volatile bool childrenLive;
-
     NVRWriteThread *write_thread;
     NVRAudioThread *audio_thread;
 
     bool recording;
-    bool errored;
 
     int keyframedist;
     vector<struct seektable_entry> *seektable;

mythtv/libs/libmythtv/mpegrecorder.cpp

@@ -933 +933 @@
     {
         QMutexLocker locker(&pauseLock);
         request_recording = true;
+        request_helper = true;
         recording = true;
         recordingWait.wakeAll();
     }
@@ -1145 +1146 @@
 
     StopEncoding(readfd);
 
+    {
+        QMutexLocker locker(&pauseLock);
+        request_helper = false;
+    }
+
+    if (vbi_thread)
+    {
+        vbi_thread->wait();
+        delete vbi_thread;
+        vbi_thread = NULL;
+        CloseVBIDevice();
+    }
+
     FinishRecording();
 
     delete[] buffer;
@@ -1157 +1171 @@
     }
 
     QMutexLocker locker(&pauseLock);
+    request_recording = false;
     recording = false;
     recordingWait.wakeAll();
 }

mythtv/libs/libmythtv/v4lrecorder.cpp

@@ -33 +33 @@
     ntsc_vbi_width(0),        ntsc_vbi_start_line(0),
     ntsc_vbi_line_count(0),
     vbi608(NULL),
-    vbi_thread(NULL),         vbi_fd(-1)
+    vbi_thread(NULL),         vbi_fd(-1),
+    request_helper(false)
 {
 }
 
 V4LRecorder::~V4LRecorder()
 {
+    {
+        QMutexLocker locker(&pauseLock);
+        request_helper = false;
+        unpauseWait.wakeAll();
+    }
+
     if (vbi_thread)
     {
+        vbi_thread->wait();
         delete vbi_thread;
         vbi_thread = NULL;
+        CloseVBIDevice();
     }
 }
 
@@ -53 +62 @@
         vbi_thread->wait();
 }
 
+bool V4LRecorder::IsHelperRequested(void) const
+{
+    QMutexLocker locker(&pauseLock);
+    return request_helper && request_recording;
+}
+
 void V4LRecorder::SetOption(const QString &name, const QString &value)
 {
     if (name == "audiodevice")
@@ -252 +267 @@
         ptr_end   = buf + sz;
     }
 
-    while (IsRecordingRequested() && !IsErrored())
+    while (IsHelperRequested() && !IsErrored())
     {
         if (PauseAndWait())
             continue;
 
-        if (!IsRecordingRequested())
+        if (!IsHelperRequested() || IsErrored())
             break;
 
         struct timeval tv;

mythtv/libs/libmythtv/v4lrecorder.h

@@ -38 +38 @@
     void CloseVBIDevice(void);
     void RunVBIDevice(void);
 
+    virtual bool IsHelperRequested(void) const;
     virtual void FormatTT(struct VBIData *vbidata) {}
     virtual void FormatCC(uint code1, uint code2) {}
 
@@ -54 +55 @@
     VBIThread       *vbi_thread;
     QList<struct txtbuffertype*> textbuffer;
     int              vbi_fd;
+    volatile bool    request_helper;
 };
 
 class VBIThread : public MThread