Ticket #6032: HDicons.codechanges.noPBB.diff

libs/libmythtv/dbcheck.cpp

@@ -18 +18 @@
 #define MINIMUM_DBMS_VERSION 5,0,15
 
 /// This is the DB schema version expected by the running MythTV instance.
-const QString currentDatabaseVersion = "1228";
+const QString currentDatabaseVersion = "1229";
 
 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(
@@ -4396 +4396 @@
             return false;
     }
 
+    if (dbver == "1228") 
+    { 
+        const char *updates[] = { 
+"ALTER TABLE recordedprogram CHANGE COLUMN videoprop videoprop " 
+"    SET('HDTV', 'WIDESCREEN', 'AVC', '720', '1080') NOT NULL; ", 
+NULL 
+}; 
+         
+        if (!performActualUpdate(updates, "1229", dbver)) 
+            return false; 
+    }  
+
     return true;
 }
 

libs/libmythtv/programinfo.h

@@ -95 +95 @@
     VID_HDTV          = 0x01,
     VID_WIDESCREEN    = 0x02,
     VID_AVC           = 0x04,
+    VID_720           = 0x08,
+    VID_1080          = 0x10,
 };
 
 // if SubtitleTypes changes, the audioprop column in program and
@@ -316 +318 @@
     void SetAspectChange(MarkTypes type, long long frame,
                          uint customAspect);
 
-    // Resolution Set
+    // Resolution Set/Get
     void SetResolution(uint width, uint height, long long frame);
+    int GetHeight(void);
+    void SetVidpropHeight(int height);
 
     // GUI stuff
     void showDetails(void) const;
@@ -354 +358 @@
     QString chanstr;
     QString chansign;
     QString channame;
+    uint tall;
 
-
     int recpriority;
     QString recgroup;
     QString playgroup;

libs/libmythtv/tv_rec.cpp

@@ -1083 +1083 @@
     int filelen = -1;
     pauseNotify = false;
     ispip = false;
+    int recHeight;
 
     if (recorder && HasFlags(kFlagRecorderRunning))
     {
@@ -1090 +1091 @@
         // may not be constant if using a DTV based recorder.
         filelen = (int)((float)GetFramesWritten() / GetFramerate());
 
+        // Get the height and set the videoprops
+        recHeight = curRecording->GetHeight(); 
+        curRecording->SetVidpropHeight(recHeight);
+
         QString message = QString("DONE_RECORDING %1 %2")
             .arg(cardid).arg(filelen);
         MythEvent me(message);

libs/libmythtv/programinfo.cpp

@@ -3026 +3026 @@
         MythDB::DBError("Resolution insert", query);
 }
 
+/** \fn ProgramInfo::GetHeight(void)
+ *  \brief Gets overall average height.
+ */
+int ProgramInfo::GetHeight(void)
+{
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    query.prepare("SELECT recordedmarkup.DATA FROM recordedmarkup"
+                  " WHERE recordedmarkup.chanid = :CHANID" 
+                  " AND recordedmarkup.starttime = :STARTTIME" 
+                  " AND recordedmarkup.type = 31"
+                  " GROUP BY recordedmarkup.data ORDER BY"
+                  " SUM((SELECT IFNULL(rm.mark, recordedmarkup.mark)"
+                  " FROM recordedmarkup AS rm WHERE rm.chanid = recordedmarkup.chanid"
+                  " AND rm.starttime = recordedmarkup.starttime AND"
+                  " rm.type = recordedmarkup.type AND"
+                  " rm.mark > recordedmarkup.mark"
+                  " ORDER BY rm.mark ASC LIMIT 1)"
+                  " - recordedmarkup.mark) DESC LIMIT 1;");
+    query.bindValue(":CHANID", chanid);
+    query.bindValue(":STARTTIME", recstartts);
+
+    if (query.exec() && query.isActive() && query.size() > 0)
+    {
+        query.next();
+        tall = query.value(0).toInt();
+    }
+    else
+        tall = 0;
+
+    return tall;
+}
+
+/** \fn ProgramInfo::SetVidpropHeight(int height)
+ *  \brief Sets overall average height flag in videoprops.
+ */
+void ProgramInfo::SetVidpropHeight(int height)
+{
+
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    query.prepare("UPDATE recordedprogram SET videoprop ="
+    " CONCAT_WS(',', IF(videoprop = '', NULL, videoprop), :VALUE)"
+    " WHERE chanid = :CHANID AND starttime = :STARTTIME;");
+
+    if (height > 700 && height < 800)
+    {
+        VERBOSE(VB_IMPORTANT, QString("Recording designated 720p because height was %1").arg(height));
+        videoproperties |= VID_720;
+
+        query.bindValue(":VALUE", "720");
+        query.bindValue(":CHANID", chanid);
+        query.bindValue(":STARTTIME", startts);
+
+        query.exec();
+        if (!query.isActive())
+        MythDB::DBError("UpdateRes", query);
+
+    }
+    else if (height > 1000 && height < 1100)
+    {
+        VERBOSE(VB_IMPORTANT, QString("Recording designated 1080i/p because height was %1").arg(height));
+        videoproperties |= VID_1080;
+
+        query.bindValue(":VALUE", "1080");
+        query.bindValue(":CHANID", chanid);
+        query.bindValue(":STARTTIME", startts);
+
+        query.exec();
+        if (!query.isActive())
+        MythDB::DBError("UpdateRes", query);
+    }
+    else
+    {
+        VERBOSE(VB_IMPORTANT, QString("Unknown type, recording height was %1").arg(height));
+        return;
+    }
+}
+
 /** \fn ProgramInfo::ReactivateRecording(void)
  *  \brief Asks the scheduler to restart this recording if possible.
  */
@@ -3853 +3932 @@
         attr += QObject::tr("Widescreen") + ", ";
     if  (videoprop & VID_AVC)
         attr += QObject::tr("AVC/H.264") + ", ";
+    if  (videoprop & VID_720)
+        attr += QObject::tr("720p Resolution") + ", ";
+    if  (videoprop & VID_1080)
+        attr += QObject::tr("1080i/p Resolution") + ", ";
 
     if (subtype & SUB_HARDHEAR)
         attr += QObject::tr("CC","Closed Captioned") + ", ";