@oxymoron.13/tizentube-s95b 0.2.3 → 0.3.0

package/mods/features/s95bI18n.js

@@ -1,22 +1,22 @@
 /* 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',
   }),
   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',

package/mods/features/s95bMenu.js

@@ -6,11 +6,10 @@
 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';
 
 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 +28,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 +50,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 +68,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 +77,7 @@ function statsLine() {
     }
   }
   return t('statVideo') + ': ' + size + '  |  ' + t('statFrames') + ': ' + dropped +
-    '  |  ' + t('statCodec') + ': ' + codecLabel(currentCodec());
+    '  |  ' + t('statCodec') + ': ' + codecLabel(t, currentCodec());
 }
 
 function buildOptions() {
@@ -89,12 +88,8 @@ 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),
     { name: t('light'), subtitle: t('lightHint'), value: 's95bLowOverhead' }
   ];
 }

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';
@@ -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.0",
   "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);
 });