Skip to content

[ONEM-29845] - changes from upstream to support mp2t for running sample app for shaka #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gowthami-cl-infosys wants to merge 1 commit into
base: lgi-wpe-2.38-23Q4
Choose a base branch
from
Open

[ONEM-29845] - changes from upstream to support mp2t for running sample app for shaka #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ GStreamerRegistryScanner::RegistryLookupResult GStreamerRegistryScanner::Element
}
}

shouldCheckHardwareClassifier = CheckHardwareClassifier::Yes;
if (shouldCheckHardwareClassifier == CheckHardwareClassifier::Yes) {
for (GList* factories = candidates; factories; factories = g_list_next(factories)) {
auto* factory = reinterpret_cast<GstElementFactory*>(factories->data);
Expand Down Expand Up @@ -439,7 +440,7 @@ void GStreamerRegistryScanner::initializeDecoders(const GStreamerRegistryScanner
{ ElementFactories::Type::AudioDecoder, "audio/x-eac3", { "audio/x-ac3"_s }, { "x-eac3"_s, "ec3"_s, "ec-3"_s, "eac3"_s } },
{ ElementFactories::Type::AudioDecoder, "audio/x-flac", { "audio/x-flac"_s, "audio/flac"_s }, {"x-flac"_s, "flac"_s } },
{ ElementFactories::Type::VideoDecoder, "video/mpeg", { }, { "mp2v"_s } },
{ ElementFactories::Type::Demuxer, "video/mpegts", { "video/mp2t"_s }, { } },
{ ElementFactories::Type::Demuxer, "video/mpegts", { "video/mpegts"_s, "video/mp2t"_s }, { } },
};
fillMimeTypeSetFromCapsMapping(factories, mseCompatibleMapping);

Expand Down
5 changes: 5 additions & 0 deletions Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,11 @@ AppendPipeline::AppendPipeline(SourceBufferPrivateGStreamer& sourceBufferPrivate
} else if (type.endsWith("webm"_s)) {
m_demux = makeGStreamerElement("matroskademux", nullptr);
m_typefind = makeGStreamerElement("identity", nullptr);
} else if (type.endsWith("mp2t"_s) || type.endsWith("mpegts"_s)) {
// INFO_LOG(LOGIDENTIFIER, "mp2t/mpegts support in MSE is experimental");
GST_INFO_OBJECT(m_playerPrivate->pipeline(), "mp2t/mpegts support in MSE is experimental");
m_demux = makeGStreamerElement("tsdemux", nullptr);
m_typefind = makeGStreamerElement("identity", nullptr);
} else if (type == "audio/mpeg"_s) {
m_demux = makeGStreamerElement("identity", nullptr);
m_typefind = makeGStreamerElement("typefind", nullptr);
Expand Down
8 changes: 7 additions & 1 deletion Source/WebCore/platform/graphics/gstreamer/mse/SourceBufferPrivateGStreamer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,13 @@ namespace WebCore {
bool SourceBufferPrivateGStreamer::isContentTypeSupported(const ContentType& type)
{
const auto& containerType = type.containerType();
return containerType == "audio/mpeg"_s || containerType.endsWith("mp4"_s) || containerType.endsWith("aac"_s) || containerType.endsWith("webm"_s);
#if !RELEASE_LOG_DISABLED || !defined(GST_DISABLE_GST_DEBUG)
if (containerType.endsWith("mp2t"_s)) {
// INFO_LOG(LOGIDENTIFIER, "mp2t/mpegts support in MSE is experimental");
GST_INFO("mp2t/mpegts support in MSE is experimental");
}
#endif
return containerType == "audio/mpeg"_s || containerType.endsWith("mp4"_s) || containerType.endsWith("aac"_s) || containerType.endsWith("webm"_s) || containerType.endsWith("mp2t"_s);
}

Ref<SourceBufferPrivateGStreamer> SourceBufferPrivateGStreamer::create(MediaSourcePrivateGStreamer* mediaSource, const ContentType& contentType, MediaPlayerPrivateGStreamerMSE& playerPrivate)
Expand Down
2 changes: 1 addition & 1 deletion Source/WebKit/UIProcess/API/glib/WebKitSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1485,7 +1485,7 @@ static void webkit_settings_class_init(WebKitSettingsClass* klass)
"enable-media-capabilities",
_("Enable MediaCapabilities"),
_("Whether MediaCapabilities should be enabled."),
FALSE,
TRUE,
readWriteConstructParamFlags);

/**
Expand Down