Enable Rockchip MJPEG encoder for Trickplay (#12610)

This commit is contained in:
Nyanmisaka
2024-09-09 23:24:45 +08:00
committed by GitHub
parent 0d85af019c
commit 36d934f4c0
3 changed files with 34 additions and 20 deletions

View File

@@ -129,7 +129,8 @@ namespace MediaBrowser.Controller.MediaEncoding
{
{ HardwareAccelerationType.vaapi, _defaultMjpegEncoder + "_vaapi" },
{ HardwareAccelerationType.qsv, _defaultMjpegEncoder + "_qsv" },
{ HardwareAccelerationType.videotoolbox, _defaultMjpegEncoder + "_videotoolbox" }
{ HardwareAccelerationType.videotoolbox, _defaultMjpegEncoder + "_videotoolbox" },
{ HardwareAccelerationType.rkmpp, _defaultMjpegEncoder + "_rkmpp" }
};
public static readonly string[] LosslessAudioCodecs =
@@ -5435,6 +5436,9 @@ namespace MediaBrowser.Controller.MediaEncoding
var isSwDecoder = !isRkmppDecoder;
var isSwEncoder = !isRkmppEncoder;
var isDrmInDrmOut = isRkmppDecoder && isRkmppEncoder;
var isEncoderSupportAfbc = isRkmppEncoder
&& (vidEncoder.Contains("h264", StringComparison.OrdinalIgnoreCase)
|| vidEncoder.Contains("hevc", StringComparison.OrdinalIgnoreCase));
var doDeintH264 = state.DeInterlace("h264", true) || state.DeInterlace("avc", true);
var doDeintHevc = state.DeInterlace("h265", true) || state.DeInterlace("hevc", true);
@@ -5493,7 +5497,7 @@ namespace MediaBrowser.Controller.MediaEncoding
{
// INPUT rkmpp/drm surface(gem/dma-heap)
var isFullAfbcPipeline = isDrmInDrmOut && !doOclTonemap;
var isFullAfbcPipeline = isEncoderSupportAfbc && isDrmInDrmOut && !doOclTonemap;
var swapOutputWandH = doRkVppTranspose && swapWAndH;
var outFormat = doOclTonemap ? "p010" : "nv12";
var hwScalePrefix = doRkVppTranspose ? "vpp" : "scale";
@@ -5531,12 +5535,6 @@ namespace MediaBrowser.Controller.MediaEncoding
if (doOclTonemap)
{
var tonemapFilter = GetHwTonemapFilter(options, "opencl", "nv12");
// enable tradeoffs for performance
if (!string.IsNullOrEmpty(tonemapFilter))
{
tonemapFilter += ":tradeoff=1";
}
mainFilters.Add(tonemapFilter);
}
@@ -5607,7 +5605,13 @@ namespace MediaBrowser.Controller.MediaEncoding
subFilters.Add("hwupload=derive_device=rkmpp");
// try enabling AFBC to save DDR bandwidth
overlayFilters.Add("overlay_rkrga=eof_action=pass:repeatlast=0:format=nv12:afbc=1");
var hwOverlayFilter = "overlay_rkrga=eof_action=pass:repeatlast=0:format=nv12";
if (isEncoderSupportAfbc)
{
hwOverlayFilter += ":afbc=1";
}
overlayFilters.Add(hwOverlayFilter);
}
}
else if (memoryOutput)