Merge branch 'master' into cache-update

2022-09-01 13:04:07 -07:00
parent 21231540fd 8b350bad46
commit 00f256f16f
80 changed files with 1269 additions and 14 deletions
@@ -126,8 +126,7 @@ VideoParams::VideoParams(int width, int height, const rational &time_base, Forma

 int VideoParams::generate_auto_divider(qint64 width, qint64 height)
 {
-  // Arbitrary pixel count (from 640x360)
-  const int target_res = 230400;
+  const int target_res = 1920*1080;

  qint64 megapixels = width * height;

@@ -155,8 +154,8 @@ int VideoParams::generate_auto_divider(qint64 width, qint64 height)
      }
    }

-    // "Safe" fallback
-    return 2;
+    // Fallback
+    return 1;
  }
 }