Ticket #6597: 6597-transcode-win32.2.patch

programs/programs.pro

@@ -18 +18 @@
     SUBDIRS += mythtranscode
 }
 
-mingw: SUBDIRS -= mythtranscode mythtranscode/replex

programs/mythtranscode/replex/replex.pro

@@ -23 +23 @@
 LIBS += -lmythavcodec-$$LIBVERSION -lmythavformat-$$LIBVERSION -lmythavutil-$$LIBVERSION
 LIBS += $$EXTRA_LIBS
 
+mingw:LIBS += -lws2_32
+
 isEmpty(QMAKE_EXTENSION_SHLIB) {
   QMAKE_EXTENSION_SHLIB=so
 }

programs/mythtranscode/replex/replex.c

@@ -2390 +2390 @@
                                 perror("Error opening output file");
                                 exit(1);
                         }
+#ifdef USING_MINGW
+                        _setmode(rx.fd_out, _O_BINARY);
+#endif          
                         fprintf(stderr,"Output File is: %s\n", 
                                 filename);
                 } else {
@@ -2460 +2463 @@
                         perror("Error opening output file");
                         exit(1);
                 }
+#ifdef USING_MINGW
+                _setmode(rx.dmx_out[0], _O_BINARY);
+#endif          
                 fprintf(stderr,"Video output File is: %s\n", 
                         fname);
                 
@@ -2477 +2483 @@
                                 perror("Error opening output file");
                                 exit(1);
                         }
+#ifdef USING_MINGW
+                        _setmode(rx.dmx_out[i+1], _O_BINARY);
+#endif          
                         fprintf(stderr,"Audio%d output File is: %s\n",i,fname);
                 }
                 

programs/mythtranscode/mythtranscode.pro

@@ -9 +9 @@
 target.path = $${PREFIX}/bin
 INSTALLS = target
 
+mingw:LIBS += -lws2_32 
+
 QMAKE_CLEAN += $(TARGET)
 
 # Input

programs/mythtranscode/main.cpp

@@ -812 +812 @@
     if (gContext->GetNumSetting("TruncateDeletesSlowly", 0))
         return slowDelete(filename);
 
-    return unlink(filename.toLocal8Bit().constData());
+    QFile ftarget(filename.toLocal8Bit().constData());
+    return !ftarget.remove();
 }
 
 void CompleteJob(int jobID, ProgramInfo *pginfo, bool useCutlist, int &resultCode)
@@ -854 +855 @@
         const QString newfile = cnf;
         const QByteArray anewfile = newfile.toLocal8Bit();
 
-        if (rename(fname.constData(), aoldfile.constData()) == -1)
+        QFile srcQFile(fname.constData());
+        if (!srcQFile.rename(aoldfile.constData()))
         {
             VERBOSE(VB_IMPORTANT,
                     QString("mythtranscode: Error Renaming '%1' to '%2'")
                     .arg(filename).arg(oldfile) + ENO);
         }
 
-        if (rename(atmpfile.constData(), anewfile.constData()) == -1)
+        QFile tmpQFile(atmpfile.constData());        
+        if (!tmpQFile.rename(anewfile.constData()))
         {
             VERBOSE(VB_IMPORTANT,
                     QString("mythtranscode: Error Renaming '%1' to '%2'")
@@ -966 +969 @@
                 QFile checkFile(oldfileprev);
 
                 if ((oldfileprev != newfileprev) && (checkFile.exists()))
-                    rename(aoldfileprev.constData(), anewfileprev.constData());
+                    checkFile.rename(anewfileprev.constData());
             }
         }
 

programs/mythtranscode/transcode.cpp

@@ -1201 +1201 @@
         fifow->FIFODrain();
     }
     delete newFrame;
+    // HACK? - destructor apparently never called (Qt3/Qt4 deleteLater issue?)
+    // Pointers not reset; shouldn't dtor segfault if it was working properly?
     if (player_ctx)
         delete player_ctx;
+    // HACK - delete ringbuffer else outfile is open when we try to rename it
+    // As before, destructor is supposed to take care of these deletes for us!
+    if (nvr)
+        delete nvr;
+    if (outRingBuffer)
+        delete outRingBuffer;
+
     return REENCODE_OK;
 }
 

programs/mythtranscode/mpeg2fix.h

@@ -131 +131 @@
 
   private:
     multiplex_t *mplex;
+    int fd_out;
 };
 
 class MPEG2fixup

programs/mythtranscode/mpeg2fix.cpp

@@ -448 +448 @@
 
 MPEG2replex::MPEG2replex() :
     done(0),      otype(0),
-    ext_count(0), mplex(0)
+    ext_count(0), mplex(0), fd_out(0)
 {
     memset(&vrbuf, 0, sizeof(vrbuf));
     memset(extrbuf, 0, sizeof(extrbuf));
@@ -474 +474 @@
         if (index_extrbuf[i].size)
             ring_destroy(&index_extrbuf[i]);
     }
+    if (fd_out)
+            close(fd_out);
 }
 
 int MPEG2replex::WaitBuffers()
@@ -530 +532 @@
 
 
     int video_delay = 0, audio_delay = 0;
-    int fd_out;
 
     memset(&mx, 0, sizeof(mx));
     memset(ext_ok, 0, sizeof(ext_ok));
@@ -538 +539 @@
     mx.priv = (void *)this;
 
     fd_out = open(outfile, O_WRONLY | O_CREAT | O_TRUNC | O_LARGEFILE, 0644);
+#ifdef USING_MINGW
+    _setmode(fd_out, _O_BINARY);
+#endif
 
     //await buffer fill
     pthread_mutex_lock(&mutex);
@@ -1010 +1014 @@
         VERBOSE(MPF_IMPORTANT, QString("Couldn't open file %1").arg(filename));
         return;
     }
+#ifdef USING_MINGW
+    _setmode(fh, _O_BINARY);
+#endif
 
     write(fh, info->display_fbuf->buf[0],
           info->sequence->width * info->sequence->height);
@@ -1027 +1034 @@
         VERBOSE(MPF_IMPORTANT, QString("Couldn't open file %1").arg(filename));
         return;
     }
+#ifdef USING_MINGW
+    _setmode(fh, _O_BINARY);
+#endif
 
     write(fh, data, size);
     close(fh);

libs/libmythtv/NuppelVideoRecorder.cpp

@@ -10 +10 @@
 #elif HAVE_SOUNDCARD_H
     #include <soundcard.h>
 #endif
+#ifndef USING_MINGW
 #include <sys/ioctl.h>
 #include <sys/mman.h>
+#endif
 #include <cerrno>
 #include <cmath>
 
@@ -778 +780 @@
  */
 bool NuppelVideoRecorder::MJPEGInit(void)
 {
+#ifndef USING_MINGW
     bool we_opened_fd = false;
     int init_fd = fd;
     if (init_fd < 0)
@@ -819 +822 @@
             hmjpg_maxw = 640;
         return true;
     }
-
+#endif // !USING_MINGW
     VERBOSE(VB_IMPORTANT, LOC_ERR + "MJPEG not supported by device");
     return false;
 }
@@ -966 +969 @@
 
 void NuppelVideoRecorder::ProbeV4L2(void)
 {
+#ifndef USING_MINGW
     usingv4l2 = true;
 
     struct v4l2_capability vcap;
@@ -995 +999 @@
     QString driver = (char *)vcap.driver;
     if (driver == "go7007")
         go7007 = true;
+#endif // !USING_MINGW    
 }
 
 void NuppelVideoRecorder::StartRecording(void)
@@ -1073 +1078 @@
 
 void NuppelVideoRecorder::DoV4L(void)
 {
+#ifndef USING_MINGW
     struct video_capability vc;
     struct video_mmap mm;
     struct video_mbuf vm;
@@ -1255 +1261 @@
 
     recording = false;
     close(fd);
+#endif // !USING_MINGW    
 }
 
 void NuppelVideoRecorder::DoV4L2(void)
 {
+#ifndef USING_MINGW
     struct v4l2_format     vfmt;
     struct v4l2_buffer     vbuf;
     struct v4l2_requestbuffers vrbuf;
@@ -1612 +1620 @@
     recording = false;
     close(fd);
     close(channelfd);
+#endif // !USING_MINGW
 }
 
 void NuppelVideoRecorder::DoMJPEG(void)
 {
+#ifndef USING_MINGW
     struct mjpeg_params bparm;
 
     if (ioctl(fd, MJPIOC_G_PARAMS, &bparm) < 0)
@@ -1748 +1758 @@
             
     recording = false;
     close(fd);
+#endif // !USING_MINGW    
 }
 
 int NuppelVideoRecorder::SpawnChildren(void)
@@ -2647 +2658 @@
 
 void NuppelVideoRecorder::doVbiThread(void)
 {
+#ifndef USING_MINGW    
     //VERBOSE(VB_IMPORTANT, LOC + "vbi begin");
     struct VBIData vbicallbackdata;
     struct vbi *pal_tt = NULL;
@@ -2793 +2805 @@
         cc_close(ntsc_cc);
 
     //VERBOSE(VB_RECORD, LOC + "vbi end");
+#endif // !USING_MINGW
 }
 
 

libs/libmythtv/libmythtv.pro

@@ -583 +583 @@
     DEFINES += USING_D3D
 
     HEADERS += videoout_d3d.h
-    SOURCES -= NuppelVideoRecorder.cpp
     SOURCES += videoout_d3d.cpp
 
     LIBS += -lpthread