From 1ba435409020aacfc00fb7661ef340a20890c749 Mon Sep 17 00:00:00 2001
From: Frodo19 <bilbohu@gmail.com>
Date: Mon, 27 Jan 2025 20:18:27 +0100
Subject: [PATCH] Skin estuary : improved player processinfo

---
 .../resource.language.en_gb/strings.po        |  59 ++++
 .../resource.language.hu_hu/strings.po        |  58 ++++
 .../xml/DialogPlayerProcessInfo.xml           | 275 ++++++++----------
 addons/skin.estuary/xml/Variables.xml         |  12 +
 addons/skin.estuary/xml/VideoOSD.xml          |   7 -
 5 files changed, 257 insertions(+), 154 deletions(-)

diff --git a/addons/skin.estuary/language/resource.language.en_gb/strings.po b/addons/skin.estuary/language/resource.language.en_gb/strings.po
index ebc7c199f26..88c57e1c63f 100644
--- a/addons/skin.estuary/language/resource.language.en_gb/strings.po
+++ b/addons/skin.estuary/language/resource.language.en_gb/strings.po
@@ -956,3 +956,62 @@ msgstr ""
 msgctxt "#31612"
 msgid "channels"
 msgstr ""
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31630"
+msgid "System FPS"
+msgstr ""
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31631"
+msgid "CPU frequency"
+msgstr ""
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31632"
+msgid "SoC temp"
+msgstr ""
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31633"
+msgid "Video stream cache"
+msgstr ""
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31634"
+msgid "Player process info"
+msgstr ""
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31635"
+msgid "Video source type"
+msgstr ""
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31636"
+msgid "Display mode"
+msgstr ""
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31637"
+msgid "EOTF & Gamut"
+msgstr ""
+
+#: /xml/DialogPlayerProcessInfo.xml
+#. Label to show the video pixel format
+msgctxt "#31638"
+msgid "Pixel format"
+msgstr ""
+
+
+#: /xml/DialogPlayerProcessInfo.xml
+#. Label to show the video resolution
+msgctxt "#31639"
+msgid "Video resolution"
+msgstr "Videó felbontás"
+
+#: /xml/DialogPlayerProcessInfo.xml
+#. Label to show the Audio Object Base
+msgctxt "#31640"
+msgid "Audio object base"
+msgstr "HD hang object"
diff --git a/addons/skin.estuary/language/resource.language.hu_hu/strings.po b/addons/skin.estuary/language/resource.language.hu_hu/strings.po
index 626ef59bc99..6245981b70b 100644
--- a/addons/skin.estuary/language/resource.language.hu_hu/strings.po
+++ b/addons/skin.estuary/language/resource.language.hu_hu/strings.po
@@ -785,3 +785,61 @@ msgstr ""
 #~ msgctxt "#31138"
 #~ msgid "Player process info"
 #~ msgstr "Feldolgozási információ"
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31630"
+msgid "System FPS"
+msgstr "Rendszer FPS"
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31631"
+msgid "CPU frequency"
+msgstr "CPU frekvencia"
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31632"
+msgid "SoC temp"
+msgstr "SoC hőmérséklet"
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31633"
+msgid "Video stream cache"
+msgstr "Videófolyam puffer"
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31634"
+msgid "Player process info"
+msgstr "Lejátszó információ"
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31635"
+msgid "Video source type"
+msgstr "Videó forrás típus"
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31636"
+msgid "Display mode"
+msgstr "Kijelző mód"
+
+#: /xml/DialogPlayerProcessInfo.xml
+msgctxt "#31637"
+msgid "EOTF & Gamut"
+msgstr "EOTF & Gamut"
+
+#: /xml/DialogPlayerProcessInfo.xml
+#. Label to show the video pixel format
+msgctxt "#31638"
+msgid "Pixel format"
+msgstr "Színmélység"
+
+#: /xml/DialogPlayerProcessInfo.xml
+#. Label to show the video resolution
+msgctxt "#31639"
+msgid "Video resolution"
+msgstr "Videó felbontás"
+
+#: /xml/DialogPlayerProcessInfo.xml
+#. Label to show the Audio Object Base
+msgctxt "#31640"
+msgid "Audio object base"
+msgstr "HD hang típus"
diff --git a/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml b/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml
index 9d0f1e64174..2a69b7fd6f0 100644
--- a/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml
+++ b/addons/skin.estuary/xml/DialogPlayerProcessInfo.xml
@@ -130,92 +130,99 @@
 				</control>
 			</control>
 			<control type="grouplist">
-				<left>50</left>
+				<left>1000</left>
 				<top>-204</top>
-				<visible>String.IsEqual(Window(Home).Property(PlayerInfoDialogFocus),5552)</visible>
+				<visible>String.IsEqual(Window(Home).Property(PlayerInfoDialogFocus),5553)</visible>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<width>420</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[VideoPlayer.VideoCodec,[COLOR button_focus]$LOCALIZE[31600]:[/COLOR] ]</label>
-					<font>font14</font>
+					<label>[COLOR button_focus]$LOCALIZE[31635]:[/COLOR] $VAR[HDRcodectypeVar]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(VideoPlayer.VideoCodec)</visible>
+					<visible>Player.HasVideo</visible>
 				</control>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<width>420</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[VideoPlayer.VideoResolution,[COLOR button_focus]$LOCALIZE[31601]:[/COLOR] ]</label>
-					<font>font14</font>
+					<label>[COLOR button_focus]$LOCALIZE[31639]: [/COLOR]$VAR[VideoResolutionTypeVar]  $VAR[VideoCodecVar]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(VideoPlayer.VideoResolution)</visible>
+					<visible>Player.HasVideo</visible>
 				</control>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
-					<label>$INFO[VideoPlayer.HdrType,[COLOR button_focus]$LOCALIZE[20474]:[/COLOR] ]</label>
-					<font>font14</font>
+					<width>420</width>
+					<height>40</height>
+					<aligny>bottom</aligny>
+					<label>[COLOR button_focus]$LOCALIZE[31604]: [/COLOR]$VAR[AudioCodecVar]  $VAR[AudioChannelsVar]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(VideoPlayer.HdrType)</visible>
+					<visible>!String.IsEmpty(VideoPlayer.AudioCodec)</visible>
 				</control>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<width>420</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[VideoPlayer.VideoAspect,[COLOR button_focus]$LOCALIZE[31602]:[/COLOR] ]</label>
-					<font>font14</font>
+					<label>[COLOR button_focus]$LOCALIZE[31640]: [/COLOR]$VAR[VideoplayerObjectAudioTypeVar]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(VideoPlayer.VideoAspect)</visible>
+					<visible>[String.IsEqual(VideoPlayer.AudioCodec,eac3_ddp_atmos) | String.IsEqual(VideoPlayer.AudioCodec,truehd_atmos) | String.IsEqual(VideoPlayer.AudioCodec,dtshd_ma_x) | String.IsEqual(VideoPlayer.AudioCodec,dtshd_ma_x_imax)]</visible>
 				</control>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<width>420</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[VideoPlayer.VideoBitrate,[COLOR button_focus]$LOCALIZE[31603]:[/COLOR] , kb/s]</label>
-					<font>font14</font>
+					<label>$INFO[VideoPlayer.AudioLanguage,[COLOR button_focus]$LOCALIZE[21447]:[/COLOR] ]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(VideoPlayer.VideoBitrate)</visible>
+					<visible>!String.IsEmpty(VideoPlayer.AudioLanguage)</visible>
 				</control>
-			</control>
-			<control type="grouplist">
-				<left>985</left>
-				<top>-204</top>
-				<visible>String.IsEqual(Window(Home).Property(PlayerInfoDialogFocus),5552)</visible>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<width>420</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[VideoPlayer.AudioCodec,[COLOR button_focus]$LOCALIZE[31604]:[/COLOR] ]</label>
-					<font>font14</font>
+					<label>$INFO[VideoPlayer.SubtitlesLanguage,[COLOR button_focus]$LOCALIZE[21448]:[/COLOR] ]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(VideoPlayer.AudioCodec)</visible>
+					<visible>VideoPlayer.SubtitlesEnabled</visible>
 				</control>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<width>420</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[VideoPlayer.AudioChannels,[COLOR button_focus]$LOCALIZE[31605]:[/COLOR] ]</label>
-					<font>font14</font>
+					<label>[COLOR button_focus]$LOCALIZE[21448]:[/COLOR][COLOR dimgrey]$INFO[VideoPlayer.SubtitlesLanguage, (deactivated) ][/COLOR]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(VideoPlayer.AudioChannels)</visible>
+					<visible>!VideoPlayer.SubtitlesEnabled</visible>
 				</control>
+			</control>
+			<control type="grouplist">
+				<left>1000</left>
+				<top>35</top>
+				<visible>String.IsEqual(Window(Home).Property(PlayerInfoDialogFocus),5553)</visible>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<width>870</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[VideoPlayer.AudioBitrate,[COLOR button_focus]$LOCALIZE[31606]:[/COLOR] , kb/s]</label>
-					<font>font14</font>
+					<label>[COLOR button_focus]$LOCALIZE[31030]:[/COLOR] $INFO[system.memory(used)] / $INFO[system.memory(total)] - $INFO[system.memory(used.percent)]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(VideoPlayer.AudioBitrate)</visible>
+					<visible>Player.HasVideo</visible>
 				</control>
 				<control type="label">
-					<width>880</width>
-					<height>38</height>
-					<label>$INFO[VideoPlayer.AudioLanguage,[COLOR button_focus]$LOCALIZE[21447]:[/COLOR] ]</label>
-					<font>font14</font>
+					<height>6</height>
+					<width>870</width>
+					<aligny>bottom</aligny>
+					<label></label>
+					<font>font8</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(VideoPlayer.AudioLanguage)</visible>
+				</control>
+				<control type="progress">
+					<description>RAM BAR</description>
+					<width>870</width>
+					<height>18</height>
+					<info>system.memory(used)</info>
 				</control>
 			</control>
 			<control type="grouplist">
@@ -223,142 +230,130 @@
 				<top>-204</top>
 				<visible>String.IsEqual(Window(Home).Property(PlayerInfoDialogFocus),5553)</visible>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<width>900</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
 					<label>$INFO[Player.Process(videodecoder),[COLOR button_focus]$LOCALIZE[31139]:[/COLOR] ]$VAR[VideoHWDecoder, (,)]</label>
-					<font>font14</font>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(Player.Process(videodecoder))</visible>
+					<visible>Player.HasVideo</visible>
 				</control>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<width>900</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[Player.Process(pixformat),[COLOR button_focus]$LOCALIZE[31140]:[/COLOR] ]</label>
-					<font>font14</font>
+					<label>$INFO[Player.Process(deintmethod),[COLOR button_focus]$LOCALIZE[16038]:[/COLOR] ]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(Player.Process(pixformat))</visible>
+					<visible>Player.HasVideo</visible>
 				</control>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<width>900</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[Player.Process(deintmethod),[COLOR button_focus]$LOCALIZE[16038]:[/COLOR] ]</label>
-					<font>font14</font>
+					<label>$INFO[Player.Process(videowidth),[COLOR button_focus]$LOCALIZE[38031]:[/COLOR] ,x]$INFO[Player.Process(videoheight)]$INFO[Player.Process(videoscantype)]$INFO[Player.Process(videodar),$COMMA , AR]$INFO[Player.Process(videofps),$COMMA , FPS]$INFO[VideoPlayer.VideoBitrate,$COMMA , kb/s]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(Player.Process(deintmethod))</visible>
 				</control>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<width>900</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[Player.Process(videowidth),[COLOR button_focus]$LOCALIZE[38031]:[/COLOR] ,x]$INFO[Player.Process(videoheight)]$INFO[Player.Process(videoscantype)]$INFO[Player.Process(videodar),$COMMA , AR]$INFO[Player.Process(videofps),$COMMA , FPS]$INFO[VideoPlayer.VideoBitrate,$COMMA , kb/s]</label>
-					<font>font14</font>
+					<label>$INFO[Player.CacheLevel,[COLOR button_focus]$LOCALIZE[31633]:[/COLOR] , %]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(Player.Process(videowidth))</visible>
+					<visible>Player.HasVideo</visible>
 				</control>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
-					<label>$INFO[Player.CacheLevel,[COLOR button_focus]$LOCALIZE[31598]:[/COLOR] ,%]</label>
-					<font>font14</font>
+					<width>900</width>
+					<height>40</height>
+					<aligny>bottom</aligny>
+                    <label>[COLOR button_focus]$LOCALIZE[460]:[/COLOR] $INFO[Player.Process(audiochannels),]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(Player.CacheLevel)</visible>
 				</control>
-			</control>
-			<control type="grouplist">
-				<left>985</left>
-				<top>-204</top>
-				<visible>String.IsEqual(Window(Home).Property(PlayerInfoDialogFocus),5553)</visible>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<width>900</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[Player.Process(audiodecoder),[COLOR button_focus]$LOCALIZE[31599]:[/COLOR] ]</label>
-					<font>font14</font>
+					<label>[COLOR button_focus]$LOCALIZE[31606]:[/COLOR] $INFO[Player.Process(audiodecoder)]$INFO[Player.Process(audiobitspersample),$COMMA , bits]$INFO[Player.Process(audiosamplerate),$COMMA , Hz]$INFO[VideoPlayer.AudioBitrate,$COMMA , kb/s]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(Player.Process(audiodecoder))</visible>
 				</control>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<width>900</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[Player.Process(audiochannels),[COLOR button_focus]$LOCALIZE[31605]:[/COLOR] ]</label>
-					<font>font14</font>
+					<label>$INFO[System.CpuUsage,[COLOR button_focus]$LOCALIZE[31609]:[/COLOR] ]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(Player.Process(audiochannels))</visible>
+					<visible>System.SupportsCPUUsage</visible>
 				</control>
 				<control type="label">
-					<width>885</width>
-					<height>50</height>
+					<height>6</height>
+					<width>870</width>
 					<aligny>bottom</aligny>
-					<label>$INFO[Player.Process(audiobitspersample),[COLOR button_focus]$LOCALIZE[460]:[/COLOR] , bits]$INFO[Player.Process(audiosamplerate),$COMMA , Hz]$INFO[VideoPlayer.AudioBitrate,$COMMA , kb/s]</label>
-					<font>font14</font>
+					<label></label>
+					<font>font8</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(Player.Process(audiobitspersample))</visible>
+				</control>
+				<control type="progress">
+					<description>CPU BAR</description>
+					<width>870</width>
+					<height>18</height>
+					<info>System.CPUUsage</info>
 				</control>
 			</control>
 			<control type="grouplist">
-				<left>50</left>
+				<left>1450</left>
 				<top>-204</top>
-				<visible>String.IsEqual(Window(Home).Property(PlayerInfoDialogFocus),5554)</visible>
+				<visible>Control.HasFocus(5553)</visible>
 				<control type="label">
-					<width>1820</width>
-					<height>50</height>
+					<width>420</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[System.ScreenResolution,[COLOR button_focus]$LOCALIZE[31607]:[/COLOR] ]</label>
-					<font>font14</font>
+					<label>$INFO[Player.Process(amlogic.displaymode),[COLOR button_focus]$LOCALIZE[31636]:[/COLOR] ]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(System.ScreenResolution)</visible>
+					<visible>Player.HasVideo</visible>
 				</control>
 				<control type="label">
-					<width>1820</width>
-					<height>50</height>
+					<width>420</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[System.FPS,[COLOR button_focus]$LOCALIZE[31608]:[/COLOR] , fps]</label>
-					<font>font14</font>
+					<label>$INFO[Player.Process(amlogic.eoft_gamut),[COLOR button_focus]$LOCALIZE[31637]:[/COLOR] ]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(System.FPS)</visible>
+					<visible>Player.HasVideo</visible>
 				</control>
 				<control type="label">
-					<width>1820</width>
-					<height>50</height>
+					<width>420</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[System.Memory(used.percent),[COLOR button_focus]$LOCALIZE[31030]:[/COLOR] ]</label>
-					<font>font14</font>
+					<label>$INFO[Player.Process(amlogic.pixformat),[COLOR button_focus]$LOCALIZE[31638]:[/COLOR] ]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>System.SupportsCPUUsage</visible>
+					<visible>Player.HasVideo</visible>
 				</control>
 				<control type="label">
-					<width>1820</width>
-					<height>50</height>
+					<width>420</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[System.CpuUsage,[COLOR button_focus]$LOCALIZE[31609]:[/COLOR] ]</label>
-					<font>font14</font>
+					<label>$INFO[System.CpuFrequency,[COLOR button_focus]$LOCALIZE[31631]:[/COLOR] ]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>System.SupportsCPUUsage</visible>
 				</control>
 				<control type="label">
-					<width>1820</width>
-					<height>50</height>
+					<width>420</width>
+					<height>40</height>
 					<aligny>bottom</aligny>
-					<label>$INFO[System.Memory(used.percent),[COLOR button_focus]$LOCALIZE[31030]:[/COLOR] ]</label>
-					<font>font14</font>
+					<label>$INFO[System.CPUTemperature,[COLOR button_focus]$LOCALIZE[31632]:[/COLOR] ]</label>
+					<font>font12</font>
 					<shadowcolor>black</shadowcolor>
-					<visible>!System.SupportsCPUUsage</visible>
-				</control>
-				<control type="label">
-					<width>1820</width>
-					<height>50</height>
-					<label>$INFO[System.CPUTemperature,[COLOR button_focus]$LOCALIZE[22011][/COLOR] ]</label>
-					<font>font14</font>
-					<shadowcolor>black</shadowcolor>
-					<visible>!String.IsEmpty(System.CPUTemperature)</visible>
 				</control>
 			</control>
 			<control type="grouplist" id="5550">
-				<right>20</right>
+				<right>15</right>
 				<top>-310</top>
 				<width>1000</width>
 				<height>100</height>
@@ -376,27 +371,13 @@
 					<visible>VideoPlayer.Content(livetv)</visible>
 					<onfocus>SetProperty(PlayerInfoDialogFocus,5551,Home)</onfocus>
 				</control>
-				<control type="button" id="5552">
-					<width>auto</width>
-					<height>100</height>
-					<textoffsetx>40</textoffsetx>
-					<label>$LOCALIZE[31610]</label>
-					<onfocus>SetProperty(PlayerInfoDialogFocus,5552,Home)</onfocus>
-				</control>
 				<control type="button" id="5553">
 					<width>auto</width>
 					<height>100</height>
 					<textoffsetx>40</textoffsetx>
-					<label>$LOCALIZE[31138]</label>
+					<label>$LOCALIZE[31634]</label>
 					<onfocus>SetProperty(PlayerInfoDialogFocus,5553,Home)</onfocus>
 				</control>
-				<control type="button" id="5554">
-					<width>auto</width>
-					<height>100</height>
-					<textoffsetx>40</textoffsetx>
-					<label>$LOCALIZE[31611]</label>
-					<onfocus>SetProperty(PlayerInfoDialogFocus,5554,Home)</onfocus>
-				</control>
 			</control>
 		</control>
 	</controls>
diff --git a/addons/skin.estuary/xml/Variables.xml b/addons/skin.estuary/xml/Variables.xml
index c75e4bad1f0..a4219452a56 100644
--- a/addons/skin.estuary/xml/Variables.xml
+++ b/addons/skin.estuary/xml/Variables.xml
@@ -874,4 +874,16 @@
 		<value condition="String.IsEqual(ListItem.Property(stream.isforced),true)">$LOCALIZE[39106]</value>
 		<value condition="String.IsEqual(ListItem.Property(stream.isoriginal),true)">$LOCALIZE[39111]</value>
 	</variable>
+	<variable name="HDRcodectypeVar">
+		<value condition="String.Contains(VideoPlayer.HdrType,dolbyvision)">Dolby Vision</value>
+		<value condition="String.Contains(VideoPlayer.HdrType,hdr10)">HDR10</value>
+		<value condition="String.Contains(VideoPlayer.HdrType,hlg">HLG</value>
+		<value condition="String.IsEmpty(VideoPlayer.HdrType)">SDR</value>
+	</variable>
+	<variable name="VideoplayerObjectAudioTypeVar">
+		<value condition="String.IsEqual(VideoPlayer.AudioCodec,eac3_ddp_atmos)">Dolby Atmos</value>
+		<value condition="String.IsEqual(VideoPlayer.AudioCodec,truehd_atmos)">Dolby Atmos</value>
+		<value condition="String.IsEqual(VideoPlayer.AudioCodec,dtshd_ma_x)">DTS:X</value>
+		<value condition="String.IsEqual(VideoPlayer.AudioCodec,dtshd_ma_x_imax)">DTS:X IMAX</value>
+	</variable>
 </includes>
diff --git a/addons/skin.estuary/xml/VideoOSD.xml b/addons/skin.estuary/xml/VideoOSD.xml
index 1b8f884083f..5dd32eef504 100644
--- a/addons/skin.estuary/xml/VideoOSD.xml
+++ b/addons/skin.estuary/xml/VideoOSD.xml
@@ -150,13 +150,6 @@
 						<onclick>PlayerControl(ShowVideoMenu)</onclick>
 						<visible>VideoPlayer.HasMenu</visible>
 					</control>
-					<control type="radiobutton" id="70011">
-					<include content="OSDButton">
-					       <param name="texture" value="osd/fullscreen/buttons/processinfo.png"/>
-					</include>
-					       <onclick>Action(Close)</onclick>
-					       <onclick>ActivateWindow(playerprocessinfo)</onclick>
-				        </control>
 					<control type="radiobutton" id="70040">
 						<include content="OSDButton">
 							<param name="texture" value="osd/fullscreen/buttons/channels.png"/>