Ticket #462: pipaspect.diff

mythtv/libs/libmythtv/videooutbase.cpp

@@ -169 +169 @@
     ZoomedIn(0),              ZoomedUp(0),              ZoomedRight(0),
 
     // Picture-in-Picture stuff
-    PIPLocation(0),
+    PIPLocation(0),           desired_pipsize(26),
     desired_piph(128),        desired_pipw(160),
     piph_in(-1),              pipw_in(-1),
     piph_out(-1),             pipw_out(-1),
@@ -568 +568 @@
     if (imgw == 1920 && imgh == 1088)
         imgh = 1080; // ATSC 1920x1080
 
-    // Set an appropriate PiP size
-    if (imgh > 1000)
-        (desired_pipw = 368), (desired_piph = 288);
-    else if (imgh > 700)
-        (desired_pipw = 240), (desired_piph = 192);
-    else
-        (desired_pipw = 160), (desired_piph = 128);
-
     // Get display aspect and correct for rounding errors
     displayAspect = GetDisplayAspect();
 
@@ -1039 +1031 @@
     int pipw, piph;
 
     VideoFrame *pipimage = pipplayer->GetCurrentFrame(pipw, piph);
+    float pipvideoAspect = pipplayer->GetVideoAspect();
 
-    if (!pipimage || !pipimage->buf || pipimage->codec != FMT_YV12)
+    if (videoAspect <= 0
+        || frame->height <= 0
+        || frame->width <= 0 
+        || !pipimage 
+        || !pipimage->buf 
+        || pipimage->codec != FMT_YV12)
     {
         pipplayer->ReleaseCurrentFrame(pipimage);
         return;
     }
+    
+    desired_piph = frame->height * desired_pipsize / 100;
+    desired_pipw = (int) ((frame->width * desired_pipsize / 100) * (pipvideoAspect / videoAspect));
+    desired_piph -= desired_piph % 2;
+    desired_pipw -= desired_pipw % 2;
 
     int xoff;
     int yoff;

mythtv/libs/libmythtv/videooutbase.h

@@ -327 +327 @@
 
     // Picture-in-Picture
     int PIPLocation;
+    int desired_pipsize;
     int desired_piph;
     int desired_pipw;
     int piph_in;