Ticket #69: aspect.diff

libs/libmythtv/NuppelVideoPlayer.h

@@ -101 +101 @@
     OSD *GetOSD(void) { return osd; }
 
     // don't use this on something you're playing
-    char *GetScreenGrab(int secondsin, int &buflen, int &vw, int &vh);
+    char *GetScreenGrab(int secondsin, int &buflen, int &vw, int &vh, float &ar);
 
     void SetLength(int len) { totalLength = len; }
     int GetLength(void) { return totalLength; }

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -3357 +3357 @@
 }
 
 char *NuppelVideoPlayer::GetScreenGrab(int secondsin, int &bufflen, int &vw,
-                                       int &vh)
+                                       int &vh, float &ar)
 {
     using_null_videoout = true;
 
@@ -3423 +3423 @@
     {
         bufflen = 0;
         vw = vh = 0;
+        ar = 0;
         return NULL;
     }
 
@@ -3432 +3433 @@
     {
         bufflen = 0;
         vw = vh = 0;
+        ar = 0;
         return NULL;
     }
 
@@ -3452 +3454 @@
 
     vw = video_width;
     vh = video_height;
+    ar = video_aspect;
 
     return (char *)outputbuf;
 }

libs/libmythtv/tv_rec.cpp

@@ -967 +967 @@
  */
 char *TVRec::GetScreenGrab(const ProgramInfo *pginfo, const QString &filename,
                            int secondsin, int &bufferlen,
-                           int &video_width, int &video_height)
+                           int &video_width, int &video_height,
+                           float &video_aspect)
 {
     (void) pginfo;
     (void) filename;
@@ -987 +988 @@
     nupvidplay->SetAudioSampleRate(audioSampleRateDB);
 
     char *retbuf = nupvidplay->GetScreenGrab(secondsin, bufferlen, video_width,
-                                             video_height);
+                                             video_height, video_aspect);
 
     delete nupvidplay;
     delete tmprbuf;

libs/libmythtv/tv_rec.h

@@ -75 +75 @@
 
     char *GetScreenGrab(const ProgramInfo *pginfo, const QString &filename, 
                         int secondsin, int &bufferlen,
-                        int &video_width, int &video_height);
+                        int &video_width, int &video_height,
+                        float &video_aspect);
 
     /// \brief Returns true if event loop has not been told to shut down
     bool IsRunning(void) { return runMainLoop; }

programs/mythbackend/encoderlink.h

@@ -109 +109 @@
 
     char *GetScreenGrab(const ProgramInfo *pginfo, const QString &filename,
                         int secondsin, int &bufferlen,
-                        int &video_width, int &video_height);
+                        int &video_width, int &video_height,
+                        float &video_aspect);
 
   private:
     int m_capturecardnum;

programs/mythbackend/mainserver.cpp

@@ -10 +10 @@
 
 #include <cstdlib>
 #include <cerrno>
+#include <math.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include "../../config.h"
@@ -3171 +3172 @@
 
     int len = 0;
     int width = 0, height = 0;
+    float aspect = 0;
     int secondsin = gContext->GetNumSetting("PreviewPixmapOffset", 64) +
                     gContext->GetNumSetting("RecordPreRoll",0);
 
@@ -3178 +3180 @@
                                                                 filename, 
                                                                 secondsin,
                                                                 len, width,
-                                                                height);
+                                                                height, aspect);
 
     if (data)
     {
         QImage img(data, width, height, 32, NULL, 65536 * 65536,
                    QImage::LittleEndian);
-        img = img.smoothScale(gContext->GetNumSetting("PreviewPixmapWidth", 160),
-                              gContext->GetNumSetting("PreviewPixmapHeight", 120), 
-                              QImage::ScaleMin);
 
+        float ppw = gContext->GetNumSetting("PreviewPixmapWidth", 160);
+        float pph = gContext->GetNumSetting("PreviewPixmapHeight", 120);
+
+        if (aspect <= 0)
+            aspect = ((float) width) / height;
+
+        if (aspect > ppw / pph)
+            pph = rint(ppw / aspect);
+        else
+            ppw = rint(pph * aspect);
+
+        img = img.smoothScale((int) ppw, (int) pph);
+
         filename += ".png";
         img.save(filename.ascii(), "PNG");
 

programs/mythbackend/encoderlink.cpp

@@ -993 +993 @@
 char *EncoderLink::GetScreenGrab(const ProgramInfo *pginfo,
                                  const QString &filename, 
                                  int secondsin, int &bufferlen, 
-                                 int &video_width, int &video_height)
+                                 int &video_width, int &video_height,
+                                 float &video_aspect)
 {
     if (local)
         return tv->GetScreenGrab(pginfo, filename, secondsin, bufferlen, 
-                                 video_width, video_height);
+                                 video_width, video_height, video_aspect);
 
     VERBOSE(VB_IMPORTANT, "Should be local only query: GetScreenGrab");
     return NULL;