Skip to content

Commit 5811158

Browse files
asurdej-comcastphiln
authored andcommitted
Backport wpe-2.46 adjustments
1 parent 58faee6 commit 5811158

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2588,12 +2588,12 @@ void MediaPlayerPrivateGStreamer::configureElement(GstElement* element)
25882588
if (webkitGstCheckVersion(1, 22, 0) && g_str_has_prefix(elementName.get(), "urisourcebin") && (isMediaSource() || isMediaStreamPlayer()))
25892589
g_object_set(element, "use-buffering", FALSE, "parse-streams", !isMediaStreamPlayer(), nullptr);
25902590

2591-
if (nameView.startsWith("parsebin"_s))
2591+
if (g_str_has_prefix(elementName.get(), "parsebin"))
25922592
configureParsebin(element);
25932593

25942594
// The legacy decodebin2 stack doesn't integrate well with parsebin, so prevent auto-plugging of
25952595
// the webkitthunderparser.
2596-
if (nameView.startsWith("uridecodebin"_s) && m_isLegacyPlaybin)
2596+
if (g_str_has_prefix(elementName.get(), "uridecodebin") && m_isLegacyPlaybin)
25972597
configureUriDecodebin2(element);
25982598

25992599
// In case of playbin3 with <video ... preload="auto">, instantiate

Source/WebCore/platform/graphics/gstreamer/mse/AppendPipeline.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,12 @@ void AppendPipeline::removeParserForDemuxerPad(const GRefPtr<GstPad>& pad)
390390
if (!parserPeerPad) [[unlikely]]
391391
return;
392392

393-
gstElementLockAndSetState(parser.get(), GST_STATE_NULL);
393+
{
394+
auto locker = GstStateLocker(m_pipeline.get());
395+
gst_element_set_locked_state(parser.get(), TRUE);
396+
gst_element_set_state(parser.get(), GST_STATE_NULL);
397+
gst_element_set_locked_state(parser.get(), FALSE);
398+
}
394399
gst_pad_unlink(pad.get(), peer.get());
395400
gst_pad_unlink(srcPad.get(), parserPeerPad.get());
396401
gst_bin_remove(GST_BIN_CAST(m_pipeline.get()), parser.get());

0 commit comments

Comments
 (0)