Default filter mode auto-adjustment to selected overscan mode.

diff --git a/od-win32/win32_scaler.cpp b/od-win32/win32_scaler.cpp
index d86f4e5574080012599b3a62b60d57ab7a94c7b5..1a8ea6928437db1341b41184022e1b443acfd634 100644 (file)
--- a/od-win32/win32_scaler.cpp
+++ b/od-win32/win32_scaler.cpp
@@ -316,10 +316,23 @@ void getfilterdata(int monid, struct displayscale *ds)
                                ch = avidinfo->drawbuffer.inheight;
                                cv = 1;
                                if (scalemode == AUTOSCALE_STATIC_NOMINAL) { // || scalemode == AUTOSCALE_INTEGER)) {
-                                       cx = 28 << currprefs.gfx_resolution;
-                                       cy = 10 << currprefs.gfx_vresolution;
-                                       cw -= 40 << currprefs.gfx_resolution;
-                                       ch -= 20 << currprefs.gfx_vresolution;
+                                       if (currprefs.gfx_overscanmode < OVERSCANMODE_ULTRA) {
+                                               cx = 28 << currprefs.gfx_resolution;
+                                               cy = 10 << currprefs.gfx_vresolution;
+                                               cw -= 40 << currprefs.gfx_resolution;
+                                               ch -= 20 << currprefs.gfx_vresolution;
+                                               if (currprefs.gfx_overscanmode == OVERSCANMODE_BROADCAST) {
+                                                       cx -= 4 << currprefs.gfx_resolution;
+                                                       cy -= 2 << currprefs.gfx_vresolution;
+                                                       cw += 8 << currprefs.gfx_resolution;
+                                                       ch += 4 << currprefs.gfx_vresolution;
+                                               } else if (currprefs.gfx_overscanmode == OVERSCANMODE_EXTREME) {
+                                                       cx -= 7 << currprefs.gfx_resolution;
+                                                       cy -= 10 << currprefs.gfx_vresolution;
+                                                       cw += 14 << currprefs.gfx_resolution;
+                                                       ch += 20 << currprefs.gfx_vresolution;
+                                               }
+                                       }
                                }
                                if (scalemode != AUTOSCALE_INTEGER && scalemode != AUTOSCALE_INTEGER_AUTOSCALE) {
                                        set_custom_limits (cw, ch, cx, cy, true);