Ticket #2198: 1080iTranscode.patch

programs/mythtranscode/transcode.cpp

@@ -348 +348 @@
 
     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();
     long long total_frame_count = nvp->GetTotalFrameCount();
@@ -382 +387 @@
         {
             newWidth = profile.byName("width")->getValue().toInt();
             newHeight = profile.byName("height")->getValue().toInt();
-
-            if (profile.byName("transcodepreserveaspect")->getValue().toInt())
-                newHeight = (int)(1.0 * newWidth * video_height / video_width);
-
+            if (profile.byName("transcodepreserveaspect")->getValue().toInt()) {
+                if (video_height==1088) {
+                    newHeight = (int)(1.0 * newWidth * 1080 / video_width);
+                } else {
+                    newHeight = (int)(1.0 * newWidth * video_height / video_width);
+                }
+            }
             if (encodingType.left(4).lower() == "mpeg")
             {
                 // make sure dimensions are valid for MPEG codecs
@@ -702 +710 @@
                                    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);
                 }