Changeset 65766149d2 in mythtv

Timestamp:

Feb 10, 2015, 10:45:15 PM (10 years ago)

Author:

Stuart Morgan <smorgan@…>

Branches:

devel/2020-player, devel/ffmpeg-resync, fixes/0.28, fixes/29, fixes/30, fixes/31, github-templates, master

Children:

487923ff1f

Parents:

d8e11b227e

git-author:

Stuart Morgan <smorgan@…> (02/10/15 22:45:15)

git-committer:

Stuart Morgan <smorgan@…> (02/13/15 00:11:06)

Message:

Change the default file extension for recordings from .mpg to .ts

.ts is the correct extension for untranscoded recordings from digital
recorders which use the MPEG-TS container. We have been incorrectly
using the .mpg extension which is only valid for containers such as
MPEG-PS

Some video players use the extension, or for streams the mimetype
which is derived from the extension in order to correctly parse the
files.

Location:

mythtv

Files:

• libs/libmyth/programinfo.cpp (modified) (4 diffs)
• libs/libmythtv/jobqueue.cpp (modified) (1 diff)
• libs/libmythtv/recorders/channelbase.cpp (modified) (3 diffs)
• libs/libmythtv/tv_rec.cpp (modified) (1 diff)
• libs/libmythupnp/httprequest.cpp (modified) (2 diffs)
• programs/mythtranscode/main.cpp (modified) (1 diff)

mythtv/libs/libmyth/programinfo.cpp

@@ -2400 +2400 @@
     query.prepare("UPDATE recorded "
                   "SET basename = :BASENAME "
-                  "WHERE chanid = :CHANID AND "
-                  "      starttime = :STARTTIME;");
-    query.bindValue(":CHANID", chanid);
-    query.bindValue(":STARTTIME", recstartts);
+                  "WHERE recordedid = :RECORDEDID;");
+    query.bindValue(":RECORDEDID", recordedid);
+    query.bindValue(":BASENAME", basename);
+
+    if (!query.exec())
+    {
+        MythDB::DBError("SetRecordBasename", query);
+        return false;
+    }
+
+    query.prepare("UPDATE recordedfile "
+                  "SET basename = :BASENAME "
+                  "WHERE recordedid = :RECORDEDID;");
+    query.bindValue(":RECORDEDID", recordedid);
     query.bindValue(":BASENAME", basename);
 
@@ -2423 +2433 @@
  *  that value otherwise this queries the recorded table in the
  *  DB for the basename stored there for this ProgramInfo's
- *  chanid and recstartts.
+ *  recordedid
  */
 QString ProgramInfo::QueryBasename(void) const
@@ -2434 +2444 @@
     query.prepare(
         "SELECT basename "
-        "FROM recorded "
-        "WHERE chanid    = :CHANID AND "
-        "      starttime = :STARTTIME");
-    query.bindValue(":CHANID",    chanid);
-    query.bindValue(":STARTTIME", recstartts);
+        "FROM recordedfile "
+        "WHERE recordedid = :RECORDEDID;");
+    query.bindValue(":RECORDEDID", recordedid);
 
     if (!query.exec())
@@ -2451 +2459 @@
     {
         LOG(VB_GENERAL, LOG_INFO,
-                 QString("QueryBasename found no entry for %1 @ %2")
-                     .arg(chanid).arg(recstartts.toString(Qt::ISODate)));
+                 QString("QueryBasename found no entry for recording ID %1")
+                     .arg(recordedid));
     }
 

mythtv/libs/libmythtv/jobqueue.cpp

@@ -2029 +2029 @@
                 retry = false;
 
+                program_info->Reload(); // Refresh, the basename may have changed
                 filename = program_info->GetPlaybackURL(false, true);
                 QFileInfo st(filename);

mythtv/libs/libmythtv/recorders/channelbase.cpp

@@ -1175 +1175 @@
     QString                  &rbFileExt)
 {
-    rbFileExt = "mpg";
+    rbFileExt = "ts";
 
     ChannelBase *channel = NULL;
@@ -1204 +1204 @@
     {
         channel = new DummyChannel(tvrec);
-    }
-    else if (genOpt.cardtype == "FREEBOX")
+        rbFileExt = "mpg";
+    }
+    else if (genOpt.cardtype == "FREEBOX") // IPTV
     {
 #ifdef USING_IPTV
@@ -1230 +1231 @@
         if ((genOpt.cardtype != "MPEG") && (genOpt.cardtype != "HDPVR"))
             rbFileExt = "nuv";
+        else
+            rbFileExt = "mpg";
     }
     else if (genOpt.cardtype == "EXTERNAL")
     {
         channel = new ExternalChannel(tvrec, genOpt.videodev);
+        rbFileExt = "mpg";
     }
 

mythtv/libs/libmythtv/tv_rec.cpp

@@ -119 +119 @@
       tvchain(NULL),
       // RingBuffer info
-      ringBuffer(NULL), rbFileExt("mpg")
+      ringBuffer(NULL), rbFileExt("ts")
 {
     QMutexLocker locker(&cardsLock);

mythtv/libs/libmythupnp/httprequest.cpp

@@ -122 +122 @@
     { "nuv" , "video/nupplevideo"          },
     { "ogv" , "video/ogg"                  }, // Defined: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
-    { "ts"  , "video/mp2t"                 }, // HTTP Live Streaming
+    { "ts"  , "video/mp2t"                 },
     { "vob" , "video/mpeg"                 },
     { "wmv" , "video/x-ms-wmv"             }
@@ -1568 +1568 @@
     }
 
-#if 0
-    LOG(VB_GENERAL, LOG_DEBUG, QString("%1 Range Requested %2 - %3")
+    LOG(VB_HTTP, LOG_DEBUG, QString("%1 Range Requested %2 - %3")
         .arg(getSocketHandle()) .arg(*pllStart) .arg(*pllEnd));
-#endif
 
     return true;

mythtv/programs/mythtranscode/main.cpp

@@ -891 +891 @@
 
         QString cnf = filename;
-        if ((jobArgs == "RENAME_TO_NUV") &&
-            (filename.contains(QRegExp("mpg$"))))
+        if (filename.endsWith(".mpg") && jobArgs == "RENAME_TO_NUV")
         {
             QString newbase = pginfo->QueryBasename();
-
-            cnf.replace(QRegExp("mpg$"), "nuv");
-            newbase.replace(QRegExp("mpg$"), "nuv");
+            cnf.replace(".mpg", ".nuv");
+            newbase.replace(".mpg", ".nuv");
+            pginfo->SaveBasename(newbase);
+        }
+        else if (filename.endsWith(".ts"))
+        {
+            QString newbase = pginfo->QueryBasename();
+             // MPEG-TS to MPEG-PS
+            cnf.replace(".ts", ".mpg");
+            newbase.replace(".ts", ".mpg");
             pginfo->SaveBasename(newbase);
         }