moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-07-01 23:35:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Force AV_CODEC_CAP_HARDWARE set for OMX decoders

Browse Source 
There are at least 2 out-of-tree OMX decoder implementations
that both lack AV_CODEC_CAP_HARDWARE, so they trick us into
thinking that neither of them is hardware accelerated.

Fixes false decoder warnings when linked against the patched
FFmpeg builds shipping on VisionFive 2 and LicheePi 4A SBCs.
This commit is contained in:
Cameron Gutman 2024-07-05 23:04:10 -05:00
parent 27b173b76b
commit 34fa7167b1
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/streaming/video/ffmpeg.cpp
View File

@ -84,7 +84,7 @@ static const QMap<QString, int> k_NonHwaccelCodecInfo = {
bool FFmpegVideoDecoder::isHardwareAccelerated() bool FFmpegVideoDecoder::isHardwareAccelerated()
{ {
return m_HwDecodeCfg != nullptr || return m_HwDecodeCfg != nullptr ||
(m_VideoDecoderCtx->codec->capabilities & AV_CODEC_CAP_HARDWARE) != 0; (getAVCodecCapabilities(m_VideoDecoderCtx->codec) & AV_CODEC_CAP_HARDWARE) != 0;
} }
bool FFmpegVideoDecoder::isAlwaysFullScreen() bool FFmpegVideoDecoder::isAlwaysFullScreen()
@ -1165,6 +1165,22 @@ bool FFmpegVideoDecoder::isDecoderIgnored(const AVCodec *decoder)
return false; return false;
} }
int FFmpegVideoDecoder::getAVCodecCapabilities(const AVCodec *codec)
{
int caps = codec->capabilities;
// There are a bunch of out-of-tree OMX decoder implementations
// from various SBC manufacturers that all seem to forget to set
// AV_CODEC_CAP_HARDWARE (probably because the upstream OMX code
// also doesn't set it). Avoid a false decoder warning on startup
// by setting it ourselves.
if (QString::fromUtf8(codec->name).endsWith("_omx", Qt::CaseInsensitive)) {
caps |= AV_CODEC_CAP_HARDWARE;
}
return caps;
}
bool FFmpegVideoDecoder::tryInitializeHwAccelDecoder(PDECODER_PARAMETERS params, int pass, QSet<const AVCodec*>& terminallyFailedHardwareDecoders) bool FFmpegVideoDecoder::tryInitializeHwAccelDecoder(PDECODER_PARAMETERS params, int pass, QSet<const AVCodec*>& terminallyFailedHardwareDecoders)
{ {
const AVCodec* decoder; const AVCodec* decoder;
@ -1188,7 +1204,7 @@ bool FFmpegVideoDecoder::tryInitializeHwAccelDecoder(PDECODER_PARAMETERS params,
} }
// Skip non-hwaccel hardware decoders // Skip non-hwaccel hardware decoders
if (decoder->capabilities & AV_CODEC_CAP_HARDWARE) { if (getAVCodecCapabilities(decoder) & AV_CODEC_CAP_HARDWARE) {
continue; continue;
} }
@ -1322,7 +1338,7 @@ bool FFmpegVideoDecoder::initialize(PDECODER_PARAMETERS params)
} }
// Skip software/hybrid decoders and normal hwaccel decoders (which were handled in the loop above) // Skip software/hybrid decoders and normal hwaccel decoders (which were handled in the loop above)
if (!(decoder->capabilities & AV_CODEC_CAP_HARDWARE)) { if (!(getAVCodecCapabilities(decoder) & AV_CODEC_CAP_HARDWARE)) {
continue; continue;
} }
@ -1372,7 +1388,7 @@ bool FFmpegVideoDecoder::initialize(PDECODER_PARAMETERS params)
// hardware and software depending on whether an hwaccel is supplied. // hardware and software depending on whether an hwaccel is supplied.
// Instead, we tell tryInitializeRendererForUnknownDecoder() not to // Instead, we tell tryInitializeRendererForUnknownDecoder() not to
// try hwaccel for this decoder. // try hwaccel for this decoder.
if (decoder->capabilities & AV_CODEC_CAP_HARDWARE) { if (getAVCodecCapabilities(decoder) & AV_CODEC_CAP_HARDWARE) {
continue; continue;
} }

4
app/streaming/video/ffmpeg.h
View File

@ -45,8 +45,12 @@ private:
bool createFrontendRenderer(PDECODER_PARAMETERS params, bool useAlternateFrontend); bool createFrontendRenderer(PDECODER_PARAMETERS params, bool useAlternateFrontend);
static
bool isDecoderIgnored(const AVCodec* decoder); bool isDecoderIgnored(const AVCodec* decoder);
static
int getAVCodecCapabilities(const AVCodec *codec);
bool tryInitializeHwAccelDecoder(PDECODER_PARAMETERS params, bool tryInitializeHwAccelDecoder(PDECODER_PARAMETERS params,
int pass, int pass,
QSet<const AVCodec*>& terminallyFailedHardwareDecoders); QSet<const AVCodec*>& terminallyFailedHardwareDecoders);