Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1020,11 +1020,12 @@ ASCIILiteral GStreamerRegistryScanner::configurationNameForLogging(Configuration

GStreamerRegistryScanner::RegistryLookupResult GStreamerRegistryScanner::isConfigurationSupported(Configuration configuration, const MediaConfiguration& mediaConfiguration) const
{
bool isUsingHardware = false;
#ifndef GST_DISABLE_GST_DEBUG
ASCIILiteral configLogString = configurationNameForLogging(configuration);
#endif

Vector<String> allCodecs;

if (mediaConfiguration.video) {
auto& videoConfiguration = mediaConfiguration.video.value();
#ifndef GST_DISABLE_GST_DEBUG
Expand Down Expand Up @@ -1054,12 +1055,7 @@ GStreamerRegistryScanner::RegistryLookupResult GStreamerRegistryScanner::isConfi
if (!isContainerTypeSupported(configuration, contentType.containerType()))
return { false, false, nullptr };

auto codecs = contentType.codecs();
if (!codecs.isEmpty()) {
if (!areAllCodecsSupported(configuration, codecs, false))
return { false, false, nullptr };
isUsingHardware = areAllCodecsSupported(configuration, codecs, true);
}
allCodecs.appendVector(contentType.codecs());
}

if (mediaConfiguration.audio) {
Expand All @@ -1072,6 +1068,15 @@ GStreamerRegistryScanner::RegistryLookupResult GStreamerRegistryScanner::isConfi
auto contentType = ContentType(audioConfiguration.contentType);
if (!isContainerTypeSupported(configuration, contentType.containerType()))
return { false, false, nullptr };

allCodecs.appendVector(contentType.codecs());
}

bool isUsingHardware = false;
if (!allCodecs.isEmpty()) {
if (!areAllCodecsSupported(configuration, allCodecs, false))
return { false, false, nullptr };
isUsingHardware = areAllCodecsSupported(configuration, allCodecs, true);
}

return { true, isUsingHardware, nullptr };
Expand Down