@oxymoron.13/tizentube-s95b 0.2.3 → 0.3.1

package/mods/features/pictureInPicture.js

@@ -1,6 +1,7 @@
 // Picture in Picture Mode for TizenTube
 
 import resolveCommand from "../resolveCommand.js";
+import { s95bMiniLayout, s95bMiniEntered } from './s95bMiniPlayer.js';
 
 window.isPipPlaying = false;
 let PlayerService = null;
@@ -51,14 +52,10 @@ function enablePip() {
 
                     function onPipEnter() {
                         videoElement.style.removeProperty('inset');
-                        const pipWidth = window.innerWidth / 3.5;
-                        const pipHeight = window.innerHeight / 3.5;
-                        videoElement.style.width = `${pipWidth}px`;
-                        videoElement.style.height = `${pipHeight}px`;
-                        videoElement.style.top = '68vh';
-                        videoElement.style.left = '68vw';
+                        s95bMiniLayout(videoElement);
 
                         window.isPipPlaying = true;
+                        s95bMiniEntered(videoElement);
                         videoElement.removeEventListener('play', onPipEnter);
                     }
 

package/mods/features/s95bI18n.js

@@ -1,26 +1,42 @@
 /* S95B Performance Edition – GPL-3.0-only */
 export const STRINGS = Object.freeze({
   de: Object.freeze({
-    title: 'S95B · Performance', language: 'Sprache', codec: 'Videocodec', quality: 'Bevorzugte Qualität',
+    title: 'S95B · Performance', language: 'Sprache', codec: 'Videocodec', quality: 'Standardqualität (alle Videos)',
     automatic: 'Automatisch', light: 'Ressourcenschonender Modus',
     lightHint: 'Schaltet Vorschauen und DeArrow ab; vorherige Werte werden beim Ausschalten wiederhergestellt.',
     codecHint: 'H.264 liefert bei YouTube in der Regel höchstens 1080p; 4K gibt es nur als VP9 oder AV1. Ein Codec wird nur erzwungen, wenn dadurch keine Qualität verloren geht. Gilt ab dem nächsten Video.',
-    qualityHint: 'Eine feste Qualität gilt sofort. „Automatisch“ wirkt eventuell erst nach einem Neustart von YouTube.',
+    qualityHint: 'Gilt für alle Videos (YouTubes eigene Zeile „Qualität“ ändert nur das laufende Video). Eine feste Qualität gilt sofort. „Automatisch“ wirkt eventuell erst nach einem Neustart von YouTube.',
     languageHint: 'Gilt für dieses Menü, beim nächsten Öffnen.',
     statVideo: 'Video', statFrames: 'Verlorene Bilder', statCodec: 'Codec-Wunsch',
     statUnavailable: 'nicht verfügbar', statWait: 'wartet auf Video',
     languageDE: 'Deutsch', languageEN: 'English',
+    mini: 'Mini-Player',
+    miniHint: 'TizenTubes Mini-Player (Eintrag „MiniPlayer“ im Video-Menü). Änderungen gelten beim nächsten Start des Mini-Players. Ein neu gestartetes Video öffnet im Vollbild und ersetzt den Mini-Player.',
+    miniOn: 'Mini-Player anbieten',
+    miniOnHint: 'Eintrag im Video-Menü und Schaltfläche in der Player-Leiste (die Leiste ändert sich eventuell erst nach einem Neustart von YouTube).',
+    miniPos: 'Position', posBR: 'Unten rechts', posBL: 'Unten links', posTR: 'Oben rechts', posTL: 'Oben links',
+    miniSize: 'Größe', sizeSmall: 'Klein', sizeMedium: 'Mittel (wie bisher)', sizeLarge: 'Groß',
+    miniBrowse: 'Beim Stöbern', browsePlay: 'Weiterlaufen', browsePause: 'Pausieren',
+    miniBrowseHint: 'Pausieren: Das Video hält im kleinen Fenster an (der Anfang ist kurz hörbar) und läuft im Vollbild an derselben Stelle weiter.',
   }),
   en: Object.freeze({
-    title: 'S95B · Performance', language: 'Language', codec: 'Video codec', quality: 'Preferred quality',
+    title: 'S95B · Performance', language: 'Language', codec: 'Video codec', quality: 'Default quality (all videos)',
     automatic: 'Automatic', light: 'Low-overhead mode',
     lightHint: 'Disables previews and DeArrow; the previous values are restored when switched off.',
     codecHint: 'On YouTube, H.264 usually tops out at 1080p; 4K is only available as VP9 or AV1. A codec is only forced if no quality is lost. Applies from the next video.',
-    qualityHint: 'A fixed quality applies immediately. “Automatic” may only take effect after restarting YouTube.',
+    qualityHint: 'Applies to all videos (YouTube’s own “Quality” row only changes the current video). A fixed quality applies immediately. “Automatic” may only take effect after restarting YouTube.',
     languageHint: 'Applies to this menu, the next time it is opened.',
     statVideo: 'Video', statFrames: 'Dropped frames', statCodec: 'Codec preference',
     statUnavailable: 'not available', statWait: 'waiting for video',
     languageDE: 'Deutsch', languageEN: 'English',
+    mini: 'Mini player',
+    miniHint: 'TizenTube’s mini player (“MiniPlayer” row in the video menu). Changes apply the next time the mini player starts. A newly started video opens full screen and replaces the mini player.',
+    miniOn: 'Offer mini player',
+    miniOnHint: 'Row in the video menu and button in the player bar (the bar may only change after restarting YouTube).',
+    miniPos: 'Position', posBR: 'Bottom right', posBL: 'Bottom left', posTR: 'Top right', posTL: 'Top left',
+    miniSize: 'Size', sizeSmall: 'Small', sizeMedium: 'Medium (as before)', sizeLarge: 'Large',
+    miniBrowse: 'While browsing', browsePlay: 'Keep playing', browsePause: 'Pause',
+    miniBrowseHint: 'Pause: the video stops in the small window (its start is briefly audible) and continues full screen from the same position.',
   })
 });
 export function translate(lang, key) {

package/mods/features/s95bMenu.js

@@ -6,11 +6,11 @@
 import { configRead, configWrite, configChangeEmitter } from '../config.js';
 import { optionShow } from '../ui/settings.js';
 import { translate } from './s95bI18n.js';
+import { codecMenu, qualityMenu, codecLabel, currentCodec } from './s95bOptions.js';
+import { MINI_POSITIONS, MINI_SIZES, MINI_BROWSE } from './s95bMiniPlayer.js';
 
 const STATE_KEY = 's95b-perf-edition-v1';
 const EDITED = ['enablePreviews', 'enableDeArrow', 'enableDeArrowThumbnails'];
-const CODECS = ['any', 'vp9', 'av01', 'avc1'];
-const QUALITIES = ['auto', '2160p', '1440p', '1080p', '720p'];
 const defaultState = { lang: 'de', light: false, previous: null };
 let state = { ...defaultState };
 
@@ -29,16 +29,6 @@ function save() {
 }
 function t(key) { return translate(state.lang, key); }
 
-function codecLabel(value) {
-  return value === 'any' ? t('automatic') : value === 'vp9' ? 'VP9' : value === 'av01' ? 'AV1' : 'H.264';
-}
-function qualityLabel(value) {
-  return value === 'auto' ? t('automatic') : value === '2160p' ? '2160p (4K)' : value;
-}
-function currentCodec() {
-  const value = configRead('preferredVideoCodec');
-  return CODECS.indexOf(value) >= 0 ? value : 'any';
-}
 
 // Low-overhead mode: switches off a few TizenTube features and remembers the previous values.
 function turnLight(enable) {
@@ -61,6 +51,16 @@ function turnLight(enable) {
   save();
 }
 
+// Source frame rate as YouTube's own stats report it ("3840x2160@24 / ..."), same source as upstream autoFrameRate.js.
+function frameRate() {
+  try {
+    const player = document.querySelector('.html5-video-player');
+    if (!player || typeof player.getStatsForNerds !== 'function') return '';
+    const match = String(player.getStatsForNerds().resolution || '').match(/@([\d.]+)/);
+    return match ? ' @' + match[1] : '';
+  } catch (_) { return ''; }
+}
+
 // One snapshot of what the web player reports, taken each time the menu opens.
 function statsLine() {
   const video = document.querySelector('video');
@@ -69,7 +69,7 @@ function statsLine() {
   if (video) {
     const width = video.videoWidth || 0;
     const height = video.videoHeight || 0;
-    size = width > 0 && height > 0 ? width + ' × ' + height : t('statUnavailable');
+    size = width > 0 && height > 0 ? width + ' × ' + height + frameRate() : t('statUnavailable');
     if (typeof video.getVideoPlaybackQuality === 'function') {
       try {
         const q = video.getVideoPlaybackQuality();
@@ -78,7 +78,29 @@ function statsLine() {
     }
   }
   return t('statVideo') + ': ' + size + '  |  ' + t('statFrames') + ': ' + dropped +
-    '  |  ' + t('statCodec') + ': ' + codecLabel(currentCodec());
+    '  |  ' + t('statCodec') + ': ' + codecLabel(t, currentCodec());
+}
+
+const MINI_DEFAULTS = { s95bMiniPos: 'br', s95bMiniSize: 'medium', s95bMiniBrowse: 'play' };
+const MINI_VALUES = { s95bMiniPos: MINI_POSITIONS, s95bMiniSize: MINI_SIZES, s95bMiniBrowse: MINI_BROWSE };
+const MINI_LABELS = { br: 'posBR', bl: 'posBL', tr: 'posTR', tl: 'posTL', small: 'sizeSmall', medium: 'sizeMedium',
+  large: 'sizeLarge', play: 'browsePlay', pause: 'browsePause' };
+
+function miniChoice(title, key, hint) {
+  return { name: t(title), value: null, menuId: 's95b-' + key,
+    menuHeader: { title: t(title), subtitle: hint ? t(hint) : t('miniHint') },
+    options: MINI_VALUES[key].map(value => ({ name: t(MINI_LABELS[value]), key, value })) };
+}
+function miniMenu() {
+  return { name: t('mini'), icon: 'CLEAR_COOKIES', value: null, menuId: 's95b-mini',
+    menuHeader: { title: t('mini'), subtitle: t('miniHint') },
+    options: [
+      // TizenTube's own switch; the fork extends it to the "MiniPlayer" row in the video menu.
+      { name: t('miniOn'), subtitle: t('miniOnHint'), value: 'enableMPButton' },
+      miniChoice('miniPos', 's95bMiniPos'),
+      miniChoice('miniSize', 's95bMiniSize'),
+      miniChoice('miniBrowse', 's95bMiniBrowse', 'miniBrowseHint')
+    ] };
 }
 
 function buildOptions() {
@@ -89,12 +111,9 @@ function buildOptions() {
         { name: t('languageDE'), key: 's95bLanguage', value: 'de' },
         { name: t('languageEN'), key: 's95bLanguage', value: 'en' }
       ] },
-    { name: t('codec'), icon: 'VIDEO_QUALITY', value: null, menuId: 's95b-codec',
-      menuHeader: { title: t('codec'), subtitle: t('codecHint') },
-      options: CODECS.map(codec => ({ name: codecLabel(codec), key: 'preferredVideoCodec', value: codec })) },
-    { name: t('quality'), icon: 'VIDEO_QUALITY', value: null, menuId: 's95b-quality',
-      menuHeader: { title: t('quality'), subtitle: t('qualityHint') },
-      options: QUALITIES.map(quality => ({ name: qualityLabel(quality), key: 'preferredVideoQuality', value: quality })) },
+    codecMenu(t),
+    qualityMenu(t),
+    miniMenu(),
     { name: t('light'), subtitle: t('lightHint'), value: 's95bLowOverhead' }
   ];
 }
@@ -131,6 +150,9 @@ function init() {
   // Menu entries read their current value from the TizenTube config, so mirror our stored state into it first.
   if (configRead('s95bLowOverhead') !== state.light) configWrite('s95bLowOverhead', state.light);
   if (configRead('s95bLanguage') !== state.lang) configWrite('s95bLanguage', state.lang);
+  Object.keys(MINI_DEFAULTS).forEach(key => {
+    if (MINI_VALUES[key].indexOf(configRead(key)) < 0) configWrite(key, MINI_DEFAULTS[key]);
+  });
   configChangeEmitter.addEventListener('configChange', onConfigChange);
   // Capture phase on window: only the yellow key is consumed.
   window.addEventListener('keydown', onKeys, true);

package/mods/features/s95bMiniPlayer.js

@@ -0,0 +1,36 @@
+/* S95B Performance Edition – GPL-3.0-only
+ * Settings for TizenTube's own mini player (features/pictureInPicture.js): position, size and
+ * whether the video keeps playing while browsing. Called from the two patched lines in pictureInPicture.js.
+ * Defaults reproduce upstream exactly: 1/3.5 of the screen at 68vh / 68vw (bottom right), keeps playing.
+ */
+import { configRead } from '../config.js';
+
+export const MINI_POSITIONS = ['br', 'bl', 'tr', 'tl'];
+export const MINI_SIZES = ['small', 'medium', 'large'];
+export const MINI_BROWSE = ['play', 'pause'];
+const DIVISOR = { small: 4.5, medium: 3.5, large: 2.5 };
+// Upstream's gap between the mini player and the right/bottom screen edge, in vw/vh (100 - 68 - 100/3.5).
+const GAP = 100 - 68 - 100 / 3.5;
+const round = value => Math.round(value * 100) / 100;
+
+export function s95bMiniLayout(videoElement) {
+  const position = MINI_POSITIONS.indexOf(configRead('s95bMiniPos')) >= 0 ? configRead('s95bMiniPos') : 'br';
+  const divisor = DIVISOR[configRead('s95bMiniSize')] || DIVISOR.medium;
+  const far = round(100 - 100 / divisor - GAP);
+  const near = round(GAP);
+  videoElement.style.width = `${window.innerWidth / divisor}px`;
+  videoElement.style.height = `${window.innerHeight / divisor}px`;
+  videoElement.style.top = (position[0] === 'b' ? far : near) + 'vh';
+  videoElement.style.left = (position[1] === 'r' ? far : near) + 'vw';
+}
+
+// "Pause while browsing": pause once the reloaded video has really started, so YouTube's own play() call
+// is not interrupted. Going back to full screen starts the video again from this position (upstream behavior).
+export function s95bMiniEntered(videoElement) {
+  if (configRead('s95bMiniBrowse') !== 'pause') return;
+  const pauseOnce = () => {
+    videoElement.removeEventListener('playing', pauseOnce);
+    if (window.isPipPlaying) videoElement.pause();
+  };
+  videoElement.addEventListener('playing', pauseOnce);
+}

package/mods/features/s95bOptions.js

@@ -0,0 +1,30 @@
+/* S95B Performance Edition – GPL-3.0-only
+ * Codec and default-quality choices, shared by the yellow menu and the playback settings popup.
+ * Both write TizenTube's own config keys (preferredVideoCodec, preferredVideoQuality).
+ */
+import { configRead } from '../config.js';
+
+export const CODECS = ['any', 'vp9', 'av01', 'avc1'];
+export const QUALITIES = ['auto', '2160p', '1440p', '1080p', '720p'];
+
+export function codecLabel(t, value) {
+  return value === 'any' ? t('automatic') : value === 'vp9' ? 'VP9' : value === 'av01' ? 'AV1' : 'H.264';
+}
+export function qualityLabel(t, value) {
+  return value === 'auto' ? t('automatic') : value === '2160p' ? '2160p (4K)' : String(value);
+}
+export function currentCodec() {
+  const value = configRead('preferredVideoCodec');
+  return CODECS.indexOf(value) >= 0 ? value : 'any';
+}
+
+export function codecMenu(t) {
+  return { name: t('codec'), icon: 'VIDEO_QUALITY', value: null, menuId: 's95b-codec',
+    menuHeader: { title: t('codec'), subtitle: t('codecHint') },
+    options: CODECS.map(codec => ({ name: codecLabel(t, codec), key: 'preferredVideoCodec', value: codec })) };
+}
+export function qualityMenu(t) {
+  return { name: t('quality'), icon: 'VIDEO_QUALITY', value: null, menuId: 's95b-quality',
+    menuHeader: { title: t('quality'), subtitle: t('qualityHint') },
+    options: QUALITIES.map(quality => ({ name: qualityLabel(t, quality), key: 'preferredVideoQuality', value: quality })) };
+}

package/mods/features/s95bPlayback.js

@@ -0,0 +1,29 @@
+/* S95B Performance Edition – GPL-3.0-only
+ * Two entries for YouTube's playback settings popup (opened while a video plays): video codec and
+ * default quality for all videos. They open the same YouTube-drawn choice lists as the yellow menu.
+ * buttonItem is handed in by resolveCommand.js, which already imports it.
+ */
+import { configRead } from '../config.js';
+import { translate } from './s95bI18n.js';
+import { codecMenu, qualityMenu, codecLabel, qualityLabel, currentCodec } from './s95bOptions.js';
+
+export function s95bPlaybackItems(buttonItem) {
+  const lang = configRead('s95bLanguage') === 'en' ? 'en' : 'de';
+  const t = key => translate(lang, key);
+  const entry = (menu, subtitle) => buttonItem({ title: menu.name, subtitle }, { icon: menu.icon }, [{
+    customAction: {
+      action: 'OPTIONS_SHOW',
+      parameters: {
+        options: menu.options,
+        selectedIndex: Math.max(0, menu.options.findIndex(o => o.value === configRead(o.key))),
+        update: false,
+        menuId: menu.menuId,
+        menuHeader: menu.menuHeader
+      }
+    }
+  }]);
+  return [
+    entry(codecMenu(t), codecLabel(t, currentCodec())),
+    entry(qualityMenu(t), qualityLabel(t, configRead('preferredVideoQuality')))
+  ];
+}

package/mods/resolveCommand.js

@@ -1,5 +1,6 @@
 import { configWrite, configRead } from './config.js';
 import { enablePip } from './features/pictureInPicture.js';
+import { s95bPlaybackItems } from './features/s95bPlayback.js';
 import modernUI, { optionShow } from './ui/settings.js';
 import { speedSettings } from './ui/speedUI.js';
 import { showToast, buttonItem, showModal, QrCodeRenderer, overlayPanelItemListRenderer, overlayMessageRenderer } from './ui/ytUI.js';
@@ -96,7 +97,7 @@ export function patchResolveCommand() {
                         }
                     }
 
-                    cmd.openPopupAction.popup.overlaySectionRenderer.overlay.overlayTwoPanelRenderer.actionPanel.overlayPanelRenderer.content.overlayPanelItemListRenderer.items.splice(2, 0,
+                    if (configRead('enableMPButton')) cmd.openPopupAction.popup.overlaySectionRenderer.overlay.overlayTwoPanelRenderer.actionPanel.overlayPanelRenderer.content.overlayPanelItemListRenderer.items.splice(2, 0,
                         buttonItem(
                             { title: t('player.miniPlayer') },
                             { icon: 'CLEAR_COOKIES' }, [
@@ -151,6 +152,10 @@ export function patchResolveCommand() {
                             ])
                         );
                     }
+                    // S95B: video codec and default quality entries; a failure here never breaks the popup.
+                    try {
+                        cmd.openPopupAction.popup.overlaySectionRenderer.overlay.overlayTwoPanelRenderer.actionPanel.overlayPanelRenderer.content.overlayPanelItemListRenderer.items.splice(1, 0, ...s95bPlaybackItems(buttonItem));
+                    } catch (e) { console.warn('[S95B] playback settings entries skipped:', e); }
                 } else if (cmd?.watchEndpoint?.videoId) {
                     window.isPipPlaying = false;
                     const ytlrPlayerContainer = document.querySelector('ytlr-player-container');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oxymoron.13/tizentube-s95b",
   "appName": "TizenTube S95B Performance (Fork)",
-  "version": "0.2.3",
+  "version": "0.3.1",
   "description": "Unofficial fork of TizenTube (@foxreis/tizentube) for TizenBrew: reversible performance profile, German/English settings, smaller bundle.",
   "packageType": "mods",
   "websiteURL": "https://youtube.com/tv?additionalDataUrl=http%3A%2F%2Flocalhost%3A8085%2Fdial%2Fapps%2FYouTube",

package/service/service.js

@@ -115,4 +115,7 @@ setInterval(() => {
 
 app.listen(PORT, () => {
     dialServer.start();
+}).on('error', (e) => {
+    // S95B: without a handler, EADDRINUSE (e.g. original TizenTube running too) is an unhandled error event.
+    console.error('[S95B] service port ' + PORT + ' unavailable:', e && e.code);
 });