From fdf9b8f42c953a755df76939e4c9d6b866e14d14 Mon Sep 17 00:00:00 2001
From: bp2008 <bp2008@users.noreply.github.com>
Date: Fri, 14 Apr 2023 19:29:10 -0600
Subject: [PATCH] Version 233: * Automatic H.264 player selection logic should
 no longer choose HTML5 on iOS 16.4 or newer.  Current behavior is to try the
 HTML5 player again when iOS 17 comes out.

---
 ui3.htm    |  2 +-
 ui3/ui3.js | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ui3.htm b/ui3.htm
index 6228602..f583282 100644
--- a/ui3.htm
+++ b/ui3.htm
@@ -88,7 +88,7 @@
 		};
 	</script>
 	<script type="text/javascript">
-		var ui_version = "232";
+		var ui_version = "233";
 		var bi_version = "%%VERSION%%";
 		var appPath_raw = "%%VIRTDIR%%";
 		var local_bi_session = "%%SESSION%%";
diff --git a/ui3/ui3.js b/ui3/ui3.js
index 3f7ca70..2fb6f3f 100644
--- a/ui3/ui3.js
+++ b/ui3/ui3.js
@@ -15565,7 +15565,8 @@ function FetchH264VideoModule()
 		{
 			// This is the automatic player selection algorithm:
 			var isAndroidFF = BrowserIsAndroid() && BrowserIsFirefox();
-			if (mse_mp4_h264_supported && !isAndroidFF)
+			var isIOS16_4_ornewer = GetIOSVersion()[0] === 16 && GetIOSVersion()[1] >= 4;
+			if (mse_mp4_h264_supported && !isAndroidFF && !isIOS16_4_ornewer)
 			{
 				isInitialized = false;
 				Initialize(H264PlayerOptions.HTML5);
@@ -33336,6 +33337,25 @@ function BrowserIsIOSChrome()
 {
 	return BrowserIsIOS() && !!navigator.userAgent.match(/ Safari\//) && !!navigator.userAgent.match(/ CriOS\//);
 }
+/**
+ * Returns an array of 3 integers indicating the iOS version (e.g. [16, 4, 1] or [0, 0, 0] if not positively identified as iOS).
+ */
+function GetIOSVersion()
+{
+	if (BrowserIsIOS())
+	{
+		try
+		{
+			var v = (navigator.appVersion).match(/OS (\d+)_(\d+)_?(\d+)?/);
+			return [parseInt(v[1], 10), parseInt(v[2], 10), parseInt(v[3] || 0, 10)];
+		}
+		catch (ex)
+		{
+			console.error("GetIOSVersion() failed to identify iOS version. Method will return [0,0,0].", ex);
+		}
+	}
+	return [0, 0, 0];
+}
 function BrowserIsAndroid()
 {
 	return !!navigator.userAgent.match(/ Android /) || !!navigator.userAgent.match(/\(Android \d+;/);