Ticket #1897: pip.diff
File pip.diff, 1.4 KB (added by , 18 years ago) |
---|
-
mythtv/libs/libmythtv/videooutbase.cpp
1084 1084 1085 1085 VideoFrame *pipimage = pipplayer->GetCurrentFrame(pipw, piph); 1086 1086 float pipVideoAspect = pipplayer->GetVideoAspect(); 1087 uint pipVideoWidth = pipplayer->GetVideoWidth();1088 uint pipVideoHeight = pipplayer->GetVideoHeight();1089 1087 1090 1088 // If PiP is not initialized to values we like, silently ignore the frame. 1091 1089 if ((video_aspect <= 0) || (pipVideoAspect <= 0) || … … 1117 1115 letterAdj = video_aspect / letterboxed_video_aspect; 1118 1116 } 1119 1117 1120 // adjust for non-square pixels on screen 1121 float dispPixelAdj = (GetDisplayAspect() * video_dim.height()) / 1122 video_dim.width(); 1123 1124 // adjust for non-square pixels in video 1125 float vidPixelAdj = pipVideoWidth / (pipVideoAspect * pipVideoHeight); 1126 1127 // set width 1128 int tmpw = (int) (pip_desired_display_size.height() * pipVideoAspect * 1129 vidPixelAdj * dispPixelAdj * letterAdj); 1118 int tmpw = (int) (((frame->width * db_pip_size) / 100) * 1119 (pipVideoAspect / video_aspect) * letterAdj); 1130 1120 pip_desired_display_size.setWidth((tmpw >> 1) << 1); 1131 1121 1132 1122 // Scale the image if we have to...