Ticket #5932: ResolutionInDB.2.diff

libs/libmythtv/recorderbase.cpp

@@ -240 +240 @@
 
     if (rb_changed)
         m_videoAspect = 0;
+        m_videoWidth = 0;
+        m_videoHeight = 0;
 }
 
 /** \fn RecorderBase::SavePositionMap(bool)
@@ -302 +304 @@
         curRecording->SetAspectChange(mark, frame);
 }
 
+void RecorderBase::ResolutionChange(uint width,uint height)
+{
+    if (curRecording)
+        curRecording->SetResolution(width, height);
+}
+
+
 /* vim: set expandtab tabstop=4 shiftwidth=4: */

libs/libmythtv/dtvrecorder.cpp

@@ -261 +261 @@
     bool hasKeyFrame  = false;
 
     uint aspectRatio = 0;
+    uint height = 0;
+    uint width = 0;
 
     // Scan for PES header codes; specifically picture_start
     // sequence_start (SEQ) and group_start (GOP).
@@ -293 +295 @@
 
                 // Look for aspectRatio changes and store them in the database
                 aspectRatio = (bufptr[3] >> 4);
+
+                // Get resolution
+                height = ((bufptr[1] & 0xf) << 8) | bufptr[2];
+                width = (bufptr[0] <<4) | (bufptr[1]>>4);
+
                 //int frameRate = (bufptr[3] & 0x0000000f);
             }
         }
@@ -328 +335 @@
         AspectChange((AspectRatio)aspectRatio, _frames_written_count);
     }
 
+    if ((height > 0) && (height != m_videoHeight))
+    {
+        m_videoHeight = height;
+        ResolutionChange(width, height);
+    }
+
     return hasKeyFrame || (_payload_buffer.size() >= (188*50));
 }
 
@@ -469 +482 @@
         _start_code = 0xffffffff;
     }
 
+    uint height = 0;
+    uint width = 0;
+
     bool hasFrame = false;
     bool hasKeyFrame = false;
 
@@ -551 +567 @@
                 hasFrame = true;
                 _seen_sps |= hasKeyFrame;
             }
+            width = m_h264_parser.pictureWidth();
+            height  = m_h264_parser.pictureHeight();
         }
     } // for (; i < TSPacket::SIZE; i++)
 
@@ -567 +585 @@
             _frames_written_count++;
     }
 
+    if ((height > 0) && (height != m_videoHeight))
+    {
+        m_videoHeight = height;
+        ResolutionChange(width, height);
+    }
+
     return hasKeyFrame || (_payload_buffer.size() >= (188*50));
 }
 

libs/libmythtv/recorderbase.h

@@ -243 +243 @@
      */
     void AspectChange(AspectRatio ratio, long long frame);
 
+    void ResolutionChange(uint width, uint height);
+
     TVRec         *tvrec;
     RingBuffer    *ringBuffer;
     bool           weMadeBuffer;
@@ -259 +261 @@
 
     uint           m_videoAspect; // AspectRatio
 
+    uint           m_videoHeight;
+    uint           m_videoWidth;
+
     ProgramInfo   *curRecording;
 
     // For handling pausing

libs/libmythtv/programinfo.h

@@ -314 +314 @@
     // Aspect Ratio map
     void SetAspectChange(MarkTypes type, long long frame);
 
+    // Resolution Set
+    void SetResolution(uint width, uint height);
+
     // GUI stuff
     void showDetails(void) const;
     void EditRecording(void);

libs/libmythtv/programinfo.cpp

@@ -2972 +2972 @@
         MythDB::DBError("aspect ratio change insert", query);
 }
 
+/** \fn ProgramInfo::SetResolution(uint width, uint height)
+ *  \brief Store the Resolution in the recorded table
+ */
+void ProgramInfo::SetResolution(uint width, uint height)
+{
+    if (isVideo)
+        return;
+
+    MSqlQuery query(MSqlQuery::InitCon());
+
+    query.prepare("UPDATE recorded SET"
+                    " width = :WIDTH,"
+                    " height = :HEIGHT WHERE"
+                    " chanid = :CHANID AND"
+                    " starttime = :STARTTIME;");
+    query.bindValue(":CHANID", chanid);
+    query.bindValue(":STARTTIME", recstartts);
+
+    query.bindValue(":WIDTH", width);
+    query.bindValue(":HEIGHT", height);
+
+    if (!query.exec() || !query.isActive())
+        MythDB::DBError("Resolution insert", query);
+}
+
 /** \fn ProgramInfo::ReactivateRecording(void)
  *  \brief Asks the scheduler to restart this recording if possible.
  */