diff --git a/src/controllers/dashboard/encodingsettings.js b/src/controllers/dashboard/encodingsettings.js
index 3d434df7f6..86152cb9e9 100644
--- a/src/controllers/dashboard/encodingsettings.js
+++ b/src/controllers/dashboard/encodingsettings.js
@@ -19,6 +19,7 @@ function loadPage(page, config, systemInfo) {
page.querySelector('#chkHardwareEncoding').checked = config.EnableHardwareEncoding;
page.querySelector('#chkAllowHevcEncoding').checked = config.AllowHevcEncoding;
page.querySelector('#chkAllowAv1Encoding').checked = config.AllowAv1Encoding;
+ page.querySelector('#chkAllowMjpegEncoding').checked = config.AllowMjpegEncoding;
$('#selectVideoDecoder', page).val(config.HardwareAccelerationType);
$('#selectThreadCount', page).val(config.EncodingThreadCount);
page.querySelector('#chkEnableAudioVbr').checked = config.EnableAudioVbr;
@@ -125,6 +126,7 @@ function onSubmit() {
config.EnableHardwareEncoding = form.querySelector('#chkHardwareEncoding').checked;
config.AllowHevcEncoding = form.querySelector('#chkAllowHevcEncoding').checked;
config.AllowAv1Encoding = form.querySelector('#chkAllowAv1Encoding').checked;
+ config.AllowMjpegEncoding = form.querySelector('#chkAllowMjpegEncoding').checked;
ApiClient.updateNamedConfiguration('encoding', config).then(function () {
updateEncoder(form);
}, function () {
@@ -175,6 +177,9 @@ function getTabs() {
}, {
href: '#/dashboard/playback/streaming',
name: globalize.translate('TabStreaming')
+ }, {
+ href: '#/dashboard/playback/trickplay',
+ name: globalize.translate('Trickplay')
}];
}
diff --git a/src/controllers/dashboard/playback.js b/src/controllers/dashboard/playback.js
index 6b4985df34..f0d35f02ee 100644
--- a/src/controllers/dashboard/playback.js
+++ b/src/controllers/dashboard/playback.js
@@ -39,6 +39,9 @@ function getTabs() {
}, {
href: '#/dashboard/playback/streaming',
name: globalize.translate('TabStreaming')
+ }, {
+ href: '#/dashboard/playback/trickplay',
+ name: globalize.translate('Trickplay')
}];
}
@@ -52,4 +55,3 @@ $(document).on('pageinit', '#playbackConfigurationPage', function () {
loadPage(page, config);
});
});
-
diff --git a/src/controllers/dashboard/streaming.js b/src/controllers/dashboard/streaming.js
index c02a5cdbde..d6ca058743 100644
--- a/src/controllers/dashboard/streaming.js
+++ b/src/controllers/dashboard/streaming.js
@@ -30,6 +30,9 @@ function getTabs() {
}, {
href: '#/dashboard/playback/streaming',
name: globalize.translate('TabStreaming')
+ }, {
+ href: '#/dashboard/playback/trickplay',
+ name: globalize.translate('Trickplay')
}];
}
diff --git a/src/controllers/dashboard/trickplay.html b/src/controllers/dashboard/trickplay.html
new file mode 100644
index 0000000000..fb9028a010
--- /dev/null
+++ b/src/controllers/dashboard/trickplay.html
@@ -0,0 +1,65 @@
+
\ No newline at end of file
diff --git a/src/controllers/dashboard/trickplay.js b/src/controllers/dashboard/trickplay.js
new file mode 100644
index 0000000000..674434274a
--- /dev/null
+++ b/src/controllers/dashboard/trickplay.js
@@ -0,0 +1,71 @@
+import 'jquery';
+import loading from '../../components/loading/loading';
+import libraryMenu from '../../scripts/libraryMenu';
+import globalize from '../../scripts/globalize';
+import Dashboard from '../../utils/dashboard';
+
+function loadPage(page, config) {
+ const trickplayOptions = config.TrickplayOptions;
+
+ page.querySelector('#chkEnableHwAcceleration').checked = trickplayOptions.EnableHwAcceleration;
+ $('#selectScanBehavior', page).val(trickplayOptions.ScanBehavior);
+ $('#selectProcessPriority', page).val(trickplayOptions.ProcessPriority);
+ $('#txtInterval', page).val(trickplayOptions.Interval);
+ $('#txtWidthResolutions', page).val(trickplayOptions.WidthResolutions.join(','));
+ $('#txtTileWidth', page).val(trickplayOptions.TileWidth);
+ $('#txtTileHeight', page).val(trickplayOptions.TileHeight);
+ $('#txtQscale', page).val(trickplayOptions.Qscale);
+ $('#txtJpegQuality', page).val(trickplayOptions.JpegQuality);
+ $('#txtProcessThreads', page).val(trickplayOptions.ProcessThreads);
+ loading.hide();
+}
+
+function onSubmit() {
+ loading.show();
+ const form = this;
+ ApiClient.getServerConfiguration().then(function (config) {
+ const trickplayOptions = config.TrickplayOptions;
+
+ trickplayOptions.EnableHwAcceleration = form.querySelector('#chkEnableHwAcceleration').checked;
+ trickplayOptions.ScanBehavior = $('#selectScanBehavior', form).val();
+ trickplayOptions.ProcessPriority = $('#selectProcessPriority', form).val();
+ trickplayOptions.Interval = Math.max(0, parseInt($('#txtInterval', form).val() || '10000', 10));
+ trickplayOptions.WidthResolutions = $('#txtWidthResolutions', form).val().replace(' ', '').split(',').map(Number);
+ trickplayOptions.TileWidth = Math.max(1, parseInt($('#txtTileWidth', form).val() || '10', 10));
+ trickplayOptions.TileHeight = Math.max(1, parseInt($('#txtTileHeight', form).val() || '10', 10));
+ trickplayOptions.Qscale = Math.min(31, parseInt($('#txtQscale', form).val() || '10', 10));
+ trickplayOptions.JpegQuality = Math.min(100, parseInt($('#txtJpegQuality', form).val() || '80', 10));
+ trickplayOptions.ProcessThreads = parseInt($('#txtProcessThreads', form).val() || '0', 10);
+
+ ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult);
+ });
+
+ return false;
+}
+
+function getTabs() {
+ return [{
+ href: '#/dashboard/playback/transcoding',
+ name: globalize.translate('Transcoding')
+ }, {
+ href: '#/dashboard/playback/resume',
+ name: globalize.translate('ButtonResume')
+ }, {
+ href: '#/dashboard/playback/streaming',
+ name: globalize.translate('TabStreaming')
+ }, {
+ href: '#/dashboard/playback/trickplay',
+ name: globalize.translate('Trickplay')
+ }];
+}
+
+$(document).on('pageinit', '#trickplayConfigurationPage', function () {
+ $('.trickplayConfigurationForm').off('submit', onSubmit).on('submit', onSubmit);
+}).on('pageshow', '#trickplayConfigurationPage', function () {
+ loading.show();
+ libraryMenu.setTabs('playback', 3, getTabs);
+ const page = this;
+ ApiClient.getServerConfiguration().then(function (config) {
+ loadPage(page, config);
+ });
+});
diff --git a/src/controllers/playback/video/index.js b/src/controllers/playback/video/index.js
index 2cb099856b..5f212bfc3e 100644
--- a/src/controllers/playback/video/index.js
+++ b/src/controllers/playback/video/index.js
@@ -1356,6 +1356,81 @@ export default function (view) {
resetIdle();
}
+ function updateTrickplayBubbleHtml(apiClient, trickplayInfo, item, mediaSourceId, bubble, positionTicks) {
+ let doFullUpdate = false;
+ let chapterThumbContainer = bubble.querySelector('.chapterThumbContainer');
+ let chapterThumb;
+ let chapterThumbText;
+
+ // Create bubble elements if they don't already exist
+ if (chapterThumbContainer) {
+ chapterThumb = chapterThumbContainer.querySelector('.chapterThumb');
+ chapterThumbText = chapterThumbContainer.querySelector('.chapterThumbText');
+ } else {
+ doFullUpdate = true;
+
+ chapterThumbContainer = document.createElement('div');
+ chapterThumbContainer.classList.add('chapterThumbContainer');
+ chapterThumbContainer.style.overflow = 'hidden';
+
+ const chapterThumbWrapper = document.createElement('div');
+ chapterThumbWrapper.classList.add('chapterThumbWrapper');
+ chapterThumbWrapper.style.overflow = 'hidden';
+ chapterThumbWrapper.style.position = 'relative';
+ chapterThumbWrapper.style.width = trickplayInfo.Width + 'px';
+ chapterThumbWrapper.style.height = trickplayInfo.Height + 'px';
+ chapterThumbContainer.appendChild(chapterThumbWrapper);
+
+ chapterThumb = document.createElement('img');
+ chapterThumb.classList.add('chapterThumb');
+ chapterThumb.style.position = 'absolute';
+ chapterThumb.style.width = 'unset';
+ chapterThumb.style.minWidth = 'unset';
+ chapterThumb.style.height = 'unset';
+ chapterThumb.style.minHeight = 'unset';
+ chapterThumbWrapper.appendChild(chapterThumb);
+
+ const chapterThumbTextContainer = document.createElement('div');
+ chapterThumbTextContainer.classList.add('chapterThumbTextContainer');
+ chapterThumbContainer.appendChild(chapterThumbTextContainer);
+
+ chapterThumbText = document.createElement('h2');
+ chapterThumbText.classList.add('chapterThumbText');
+ chapterThumbTextContainer.appendChild(chapterThumbText);
+ }
+
+ // Update trickplay values
+ const currentTimeMs = positionTicks / 10_000;
+ const currentTile = Math.floor(currentTimeMs / trickplayInfo.Interval);
+
+ const tileSize = trickplayInfo.TileWidth * trickplayInfo.TileHeight;
+ const tileOffset = currentTile % tileSize;
+ const index = Math.floor(currentTile / tileSize);
+
+ const tileOffsetX = tileOffset % trickplayInfo.TileWidth;
+ const tileOffsetY = Math.floor(tileOffset / trickplayInfo.TileWidth);
+ const offsetX = -(tileOffsetX * trickplayInfo.Width);
+ const offsetY = -(tileOffsetY * trickplayInfo.Height);
+
+ const imgSrc = apiClient.getUrl('Videos/' + item.Id + '/Trickplay/' + trickplayInfo.Width + '/' + index + '.jpg', {
+ api_key: apiClient.accessToken(),
+ MediaSourceId: mediaSourceId
+ });
+
+ if (chapterThumb.src != imgSrc) chapterThumb.src = imgSrc;
+ chapterThumb.style.left = offsetX + 'px';
+ chapterThumb.style.top = offsetY + 'px';
+
+ chapterThumbText.textContent = datetime.getDisplayRunningTime(positionTicks);
+
+ // Set bubble innerHTML if container isn't part of DOM
+ if (doFullUpdate) {
+ bubble.innerHTML = chapterThumbContainer.outerHTML;
+ }
+
+ return true;
+ }
+
function getImgUrl(item, chapter, index, maxWidth, apiClient) {
if (chapter.ImageTag) {
return apiClient.getScaledImageUrl(item.Id, {
@@ -1681,6 +1756,33 @@ export default function (view) {
}
});
+ nowPlayingPositionSlider.updateBubbleHtml = function(bubble, value) {
+ showOsd();
+
+ const item = currentItem;
+ let ticks = currentRuntimeTicks;
+ ticks /= 100;
+ ticks *= value;
+
+ if (item?.Trickplay) {
+ const mediaSourceId = currentPlayer?.streamInfo?.mediaSource?.Id;
+ const trickplayResolutions = item.Trickplay[mediaSourceId];
+
+ if (!trickplayResolutions) return false;
+
+ // TODO: just to test. must pick proper resolution and/or check above that trickplay resolutions has at least one key.
+ return updateTrickplayBubbleHtml(
+ ServerConnections.getApiClient(item.ServerId),
+ trickplayResolutions[Object.keys(trickplayResolutions)[0]],
+ item,
+ mediaSourceId,
+ bubble,
+ ticks);
+ }
+
+ return false;
+ };
+
nowPlayingPositionSlider.getBubbleHtml = function (value) {
showOsd();
if (enableProgressByTimeOfDay) {
diff --git a/src/elements/emby-slider/emby-slider.js b/src/elements/emby-slider/emby-slider.js
index ddbe9c596c..86a52c0787 100644
--- a/src/elements/emby-slider/emby-slider.js
+++ b/src/elements/emby-slider/emby-slider.js
@@ -161,6 +161,10 @@ function updateBubble(range, percent, value, bubble) {
let html;
+ if (range.updateBubbleHtml?.(bubble, value)) {
+ return;
+ }
+
if (range.getBubbleHtml) {
html = range.getBubbleHtml(percent, value);
} else {
diff --git a/src/plugins/syncPlay/core/Helper.js b/src/plugins/syncPlay/core/Helper.js
index 47f25578a3..1489f1e156 100644
--- a/src/plugins/syncPlay/core/Helper.js
+++ b/src/plugins/syncPlay/core/Helper.js
@@ -84,7 +84,7 @@ export function getItemsForPlayback(apiClient, query) {
});
} else {
query.Limit = query.Limit || 300;
- query.Fields = 'Chapters';
+ query.Fields = ['Chapters', 'Trickplay'];
query.ExcludeLocationTypes = 'Virtual';
query.EnableTotalRecordCount = false;
query.CollapseBoxSetItems = false;
@@ -200,7 +200,7 @@ export function translateItemsForPlayback(apiClient, items, options) {
IsVirtualUnaired: false,
IsMissing: false,
UserId: apiClient.getCurrentUserId(),
- Fields: 'Chapters'
+ Fields: ['Chapters', 'Trickplay']
}).then(function (episodesResult) {
let foundItem = false;
episodesResult.Items = episodesResult.Items.filter(function (e) {
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 1f282a2112..4daf77243c 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1,4 +1,37 @@
{
+ "Trickplay": "Trickplay",
+ "TrickplayHardwareAccel": "Enable hardware acceleration",
+ "NonBlockingScan": "Non Blocking - queues generation, then returns",
+ "BlockingScan": "Blocking - queues generation, blocks scan until complete",
+ "LabelScanBehavior": "Scan Behavior",
+ "LabelScanBehaviorHelp": "The default behavior is non blocking, which will add media to the library before trickplay generation is done. Blocking will ensure trickplay files are generated before media is added to the library, but will make scans significantly longer.",
+ "PriorityHigh": "High",
+ "PriorityAboveNormal": "Above Normal",
+ "PriorityNormal": "Normal",
+ "PriorityBelowNormal": "Below Normal",
+ "PriorityIdle": "Idle",
+ "LabelProcessPriority": "Process Priority",
+ "LabelProcessPriorityHelp": "Setting this lower or higher will determine how the CPU prioritizes the ffmpeg preview images generation process in relation to other processes. If you notice slowdown while generating preview images but don't want to fully stop their generation, try lowering this as well as the thread count.",
+ "LabelImageInterval": "ImageInterval",
+ "LabelImageIntervalHelp": "Interval of time between each new trickplay image. A shorter interval and more images will take up more space.",
+ "LabelWidthResolutions": "Width Resolutions",
+ "LabelWidthResolutionsHelp": "Comma separated list of the width (px) that trickplay images will be generated at. All images should generate proportionally to the source, so a width of 320 on a 16:9 video ends up around 320x180.",
+ "LabelTileWidth": "Tile Width",
+ "LabelTileWidthHelp": "Maximum number of images to tile in X direction.",
+ "LabelTileHeight": "Tile Height",
+ "LabelTileHeightHelp": "Maximum number of images to tile in Y direction.",
+ "LabelJpegQuality": "JPEG Quality",
+ "LabelJpegQualityHelp": "The image quality for preview image tiles.",
+ "LabelQscale": "Qscale",
+ "LabelQscaleHelp": "The quality scale of images output by ffmpeg, with 2 being the highest quality and 31 being the lowest.",
+ "LabelTrickplayThreads": "FFmpeg Threads",
+ "LabelTrickplayThreadsHelp": "The number of threads to pass to the \"-threads\" argument of ffmpeg.",
+ "OptionExtractTrickplayImage": "Enable trickplay image extraction",
+ "ExtractTrickplayImagesHelp": "Trickplay images are similar to chapter images, except they span the entire length of the content and are used to show a preview when scrubbing through videos.",
+ "LabelExtractTrickplayDuringLibraryScan": "Extract trickplay images during the library scan",
+ "LabelExtractTrickplayDuringLibraryScanHelp": "Generate trickplay images when videos are imported during the library scan. Otherwise, they will be extracted during the chapter images scheduled task. If generation is set to non-blocking this will not affect the time a library scan takes to complete.",
+
+
"Absolute": "Absolute",
"AccessRestrictedTryAgainLater": "Access is currently restricted. Please try again later.",
"Actor": "Actor",