Ticket #2198: 1080iTranscode.20060821.patch

programs/mythtranscode/transcode.cpp

@@ -383 +383 @@
 
     int video_width = nvp->GetVideoWidth();
     int video_height = nvp->GetVideoHeight();
+     
+    if (video_height == 1088) {
+       VERBOSE(VB_IMPORTANT, QString("Unlikely the video height really is 1088, using hacks..."));
+    }
+
     float video_aspect = nvp->GetVideoAspect();
     float video_frame_rate = nvp->GetFrameRate();
     int newWidth = video_width;
@@ -415 +420 @@
         }
         else if (profile.byName("transcoderesize")->getValue().toInt())
         {
+            int fudge1080 = (video_height == 1088 ? 8 : 0);
+
             nvp->SetVideoFilters(vidfilters);
             newWidth = profile.byName("width")->getValue().toInt();
             newHeight = profile.byName("height")->getValue().toInt();
 
             // If height or width are 0, then we need to calculate them
             if (newHeight == 0 && newWidth > 0)
-                newHeight = (int)(1.0 * newWidth * video_height / video_width);
+                newHeight = (int)(1.0 * newWidth * (video_height-fudge1080) / video_width);
             else if (newWidth == 0 && newHeight > 0)
-                newWidth = (int)(1.0 * newHeight * video_width / video_height);
+                newWidth = (int)(1.0 * newHeight * video_width / (video_height-fudge1080));
             else if (newWidth == 0 && newHeight == 0)
             {
                 newHeight = 480;
-                newWidth = (int)(1.0 * 480 * video_width / video_height);
+                newWidth = (int)(1.0 * 480 * video_width / (video_height-fudge1080));
                 if (newWidth > 640)
                 {
                     newWidth = 640;
-                    newHeight = (int)(1.0 * 640 * video_height / video_width);
+                    newHeight = (int)(1.0 * 640 * (video_height-fudge1080) / video_width);
                 }
             }
-
             if (encodingType.left(4).lower() == "mpeg")
             {
                 // make sure dimensions are valid for MPEG codecs
                 newHeight = (newHeight + 15) & ~0xF;
                 newWidth  = (newWidth  + 15) & ~0xF;
             }
-
             VERBOSE(VB_IMPORTANT, QString("Resizing from %1x%2 to %3x%4")
                     .arg(video_width).arg(video_height)
                     .arg(newWidth).arg(newHeight));
@@ -786 +791 @@
                                    video_width, video_height);
                     avpicture_fill(&imageOut, frame.buf, PIX_FMT_YUV420P,
                                    newWidth, newHeight);
-                    scontext = img_resample_init(newWidth, newHeight,
-                                                 video_width, video_height);
+                    if (video_height != 1088) {
+                        scontext = img_resample_init(newWidth, newHeight,
+                                                     video_width, video_height);
+                    } else {
+                        scontext = img_resample_full_init(newWidth, newHeight,
+                                                          video_width, video_height,
+                                                          0,8,0,0,
+                                                          0,0,0,0);
+                    }
                     img_resample(scontext, &imageOut, &imageIn);
                     img_resample_close(scontext);
                 }
@@ -832 +844 @@
                                video_width, video_height);
                 avpicture_fill(&imageOut, frame.buf, PIX_FMT_YUV420P,
                                newWidth, newHeight);
-                scontext = img_resample_init(newWidth, newHeight,
-                                             video_width, video_height);
+                if (video_height != 1088) {
+                    scontext = img_resample_init(newWidth, newHeight,
+                                                 video_width, video_height);
+                }
+                else
+                {
+                    scontext = img_resample_full_init(newWidth, newHeight,
+                                                      video_width, video_height,
+                                                      0,8,0,0,
+                                                      0,0,0,0);
+                }
+ 
                 img_resample(scontext, &imageOut, &imageIn);
                 img_resample_close(scontext);
             }