Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2025-01-09 09:48:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix handling of non-standard hwaccel decoders that also set AV_CODEC_CAP_HARDWARE

Browse source
This commit is contained in:
Cameron Gutman 2023-09-04 23:40:59 -05:00
parent dec5a6370e
commit ebc4c71c72
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/streaming/video/ffmpeg.cpp
View file

@ -1066,6 +1066,11 @@ bool FFmpegVideoDecoder::initialize(PDECODER_PARAMETERS params)
continue; continue;
} }
// Skip non-hwaccel hardware decoders for now. We will try those in the next loop.
if (decoder->capabilities & AV_CODEC_CAP_HARDWARE) {
continue;
}
// Look for the first matching hwaccel hardware decoder (pass 0) // Look for the first matching hwaccel hardware decoder (pass 0)
for (int i = 0;; i++) { for (int i = 0;; i++) {
const AVCodecHWConfig *config = avcodec_get_hw_config(decoder, i); const AVCodecHWConfig *config = avcodec_get_hw_config(decoder, i);
@ -1082,7 +1087,7 @@ bool FFmpegVideoDecoder::initialize(PDECODER_PARAMETERS params)
} }
} }
// Iterate through non-hwaccel hardware decoders // Iterate through non-hwaccel and non-standard hwaccel hardware decoders that have AV_CODEC_CAP_HARDWARE set
codecIterator = NULL; codecIterator = NULL;
while ((decoder = av_codec_iterate(&codecIterator))) { while ((decoder = av_codec_iterate(&codecIterator))) {
// Skip codecs that aren't decoders // Skip codecs that aren't decoders
@ -1097,13 +1102,13 @@ bool FFmpegVideoDecoder::initialize(PDECODER_PARAMETERS params)
continue; continue;
} }
// Skip hwaccel and software/hybrid decoders // Skip software/hybrid decoders and normal hwaccel decoders (which were handled in the loop above)
if (avcodec_get_hw_config(decoder, 0) || !(decoder->capabilities & AV_CODEC_CAP_HARDWARE)) { if (!(decoder->capabilities & AV_CODEC_CAP_HARDWARE)) {
continue; continue;
} }
// Try this decoder // Try to initialize this decoder both as hwaccel and non-hwaccel
if (tryInitializeRendererForUnknownDecoder(decoder, params, false)) { if (tryInitializeRendererForUnknownDecoder(decoder, params, true)) {
return true; return true;
} }
} }