Ticket #1365: add-display-res-option.diff

src/dialog_options.cpp

@@ -385 +385 @@
                 Bind(control,_T("Show keyframes on video slider"));
                 videoSizer3->Add(control,0,wxEXPAND);
                 videoSizer3->AddGrowableCol(1,1);
+                control = new wxCheckBox(videoPage,-1,_("Use display aspect ratio (ffmpegsource only)"));
+                Bind(control,_T("Use display aspect ratio"));
+                videoSizer3->Add(control,0,wxEXPAND);
+                videoSizer3->AddGrowableCol(1,1);
 
                 // Second sizer
                 videoSizer4->Add(new wxStaticText(videoPage,-1,_("Video provider: ")),0,wxALIGN_CENTER_VERTICAL | wxRIGHT,10);

src/options.cpp

@@ -159 +159 @@
         SetBool(_T("Show keyframes on video slider"),true);
         SetBool(_T("Show overscan mask"),false);
 
+        SetModificationType(MOD_VIDEO_RELOAD);
+        SetBool(_T("Use display aspect ratio"),false);
+
         // Video Provider (Advanced)
         SetModificationType(MOD_VIDEO_RELOAD);
         SetInt(_T("Avisynth MemoryMax"),64,1700);

src/video_context.cpp

@@ -216 +216 @@
                 int n = frame_n;
                 SetVideo(_T(""));
                 SetVideo(name);
+                // without this, subtitles don't appear anymore
+                Refresh(true, true);
+                // without this, the video doesn't get resized
+                UpdateDisplays(true);
                 JumpToFrame(n);
         }
 }

src/video_provider_ffmpegsource.cpp

@@ -224 +224 @@
                 ErrorMsg.Append(wxString::Format(_T("Failed to decode first frame: %s"), ErrInfo.Buffer));
                 throw ErrorMsg;
         }
+
         Width   = TempFrame->EncodedWidth;
         Height  = TempFrame->EncodedHeight;
 
+        // possibly request the frames at their display resolution
+        if (Options.AsBool(_T("Use display aspect ratio"))) {
+                int sarNumerator   = VideoInfo->SARNum;
+                int sarDenominator = VideoInfo->SARDen;
+                // check them both lest we divide by zero
+                if (sarNumerator != 0 && sarDenominator != 0) {
+                        if (sarNumerator > sarDenominator) {
+                                Width = Width * sarNumerator / sarDenominator;
+                        }
+                        else if (sarNumerator < sarDenominator) {
+                                Height = Height * sarDenominator / sarNumerator;
+                        }
+                }
+        }
+
         if (FFMS_SetOutputFormatV(VideoSource, 1 << FFMS_GetPixFmt("bgra"), Width, Height, FFMS_RESIZER_BICUBIC, &ErrInfo)) {
                 ErrorMsg.Append(wxString::Format(_T("Failed to set output format: %s"), ErrInfo.Buffer));
                 throw ErrorMsg;