Skip to content

Commit 3ebee5b

Browse files
calvariscalvaris
committed
[GStreamer] Make gstObjectHasProperty use ASCIILiteral
https://bugs.webkit.org/show_bug.cgi?id=290035 Reviewed by Philippe Normand. * Source/WebCore/Modules/mediastream/gstreamer/GStreamerIceTransportBackend.cpp: (WebCore::GStreamerIceTransportBackend::iceTransportChanged): * Source/WebCore/Modules/mediastream/gstreamer/GStreamerMediaEndpoint.cpp: (WebCore::GStreamerMediaEndpoint::initializePipeline): (WebCore::GStreamerMediaEndpoint::requestPad): * Source/WebCore/platform/audio/gstreamer/AudioEncoderGStreamer.cpp: (WebCore::GStreamerInternalAudioEncoder::initialize): * Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp: (WebCore::configureAudioDecoderForHarnessing): (WebCore::configureVideoDecoderForHarnessing): (WebCore::configureMediaStreamVideoDecoder): (WebCore::configureVideoRTPDepayloader): (WebCore::gstObjectHasProperty): (WebCore::gstElementMatchesFactoryAndHasProperty): * Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h: * Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: (WebCore::MediaPlayerPrivateGStreamer::configureVideoDecoder): (WebCore::MediaPlayerPrivateGStreamer::createVideoSink): * Source/WebCore/platform/gstreamer/GStreamerHolePunchQuirkBcmNexus.cpp: (WebCore::GStreamerHolePunchQuirkBcmNexus::setHolePunchVideoRectangle): * Source/WebCore/platform/gstreamer/GStreamerHolePunchQuirkRialto.cpp: (WebCore::GStreamerHolePunchQuirkRialto::setHolePunchVideoRectangle): * Source/WebCore/platform/gstreamer/GStreamerHolePunchQuirkWesteros.cpp: (WebCore::GStreamerHolePunchQuirkWesteros::setHolePunchVideoRectangle): * Source/WebCore/platform/gstreamer/GStreamerQuirkAmLogic.cpp: (WebCore::GStreamerQuirkAmLogic::configureElement): * Source/WebCore/platform/gstreamer/GStreamerQuirkBroadcom.cpp: (WebCore::GStreamerQuirkBroadcom::configureElement): * Source/WebCore/platform/gstreamer/GStreamerQuirkBroadcomBase.cpp: (WebCore::GStreamerQuirkBroadcomBase::setupBufferingPercentageCorrection const): * Source/WebCore/platform/gstreamer/GStreamerQuirkRealtek.cpp: (WebCore::GStreamerQuirkRealtek::configureElement): * Source/WebCore/platform/gstreamer/GStreamerQuirkWesteros.cpp: (WebCore::GStreamerQuirkWesteros::configureElement): * Source/WebCore/platform/gstreamer/VideoEncoderPrivateGStreamer.cpp: (webkit_video_encoder_class_init): * Source/WebCore/platform/mediarecorder/MediaRecorderPrivateGStreamer.cpp: (WebCore::MediaRecorderPrivateBackend::configureAudioEncoder): * Source/WebCore/platform/mediastream/gstreamer/GStreamerAudioRTPPacketizer.cpp: (WebCore::GStreamerAudioRTPPacketizer::create): * Source/WebCore/platform/mediastream/gstreamer/GStreamerIncomingTrackProcessor.cpp: (WebCore::GStreamerIncomingTrackProcessor::mediaStreamIdFromPad): * Source/WebCore/platform/mediastream/gstreamer/GStreamerVideoRTPPacketizer.cpp: (WebCore::GStreamerVideoRTPPacketizer::create): * Source/WebCore/platform/mediastream/gstreamer/RealtimeOutgoingMediaSourceGStreamer.cpp: (WebCore::RealtimeOutgoingMediaSourceGStreamer::initialize): Canonical link: https://commits.webkit.org/292351@main Signed-off-by: Xabier Rodriguez Calvar <calvaris@igalia.com>
1 parent a2a49b6 commit 3ebee5b

20 files changed

Lines changed: 43 additions & 43 deletions

‎Source/WebCore/Modules/mediastream/gstreamer/GStreamerMediaEndpoint.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ bool GStreamerMediaEndpoint::initializePipeline()
187187
return false;
188188
}
189189

190-
if (gstObjectHasProperty(rtpBin.get(), "add-reference-timestamp-meta"))
190+
if (gstObjectHasProperty(rtpBin.get(), "add-reference-timestamp-meta"_s))
191191
g_object_set(rtpBin.get(), "add-reference-timestamp-meta", TRUE, nullptr);
192192

193193
g_signal_connect(rtpBin.get(), "new-jitterbuffer", G_CALLBACK(+[](GstElement*, GstElement* element, unsigned, unsigned ssrc, GStreamerMediaEndpoint* endPoint) {
@@ -1106,7 +1106,7 @@ GRefPtr<GstPad> GStreamerMediaEndpoint::requestPad(const GRefPtr<GstCaps>& allow
11061106

11071107
if (!mediaStreamID.isEmpty()) {
11081108
GST_DEBUG_OBJECT(m_pipeline.get(), "Setting msid to %s on sink pad %" GST_PTR_FORMAT, mediaStreamID.ascii().data(), sinkPad.get());
1109-
if (gstObjectHasProperty(sinkPad.get(), "msid"))
1109+
if (gstObjectHasProperty(sinkPad.get(), "msid"_s))
11101110
g_object_set(sinkPad.get(), "msid", mediaStreamID.ascii().data(), nullptr);
11111111
}
11121112

‎Source/WebCore/platform/audio/gstreamer/AudioEncoderGStreamer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ String GStreamerInternalAudioEncoder::initialize(const String& codecName, const
291291
if (codecName.startsWith("mp4a"_s)) {
292292
const char* streamFormat = config.isAacADTS.value_or(false) ? "adts" : "raw";
293293
m_outputCaps = adoptGRef(gst_caps_new_simple("audio/mpeg", "mpegversion", G_TYPE_INT, 4, "stream-format", G_TYPE_STRING, streamFormat, nullptr));
294-
if (gstObjectHasProperty(m_encoder.get(), "bitrate") && config.bitRate && config.bitRate < std::numeric_limits<int>::max())
294+
if (gstObjectHasProperty(m_encoder.get(), "bitrate"_s) && config.bitRate && config.bitRate < std::numeric_limits<int>::max())
295295
g_object_set(m_encoder.get(), "bitrate", static_cast<int>(config.bitRate), nullptr);
296296
} else if (codecName == "mp3"_s)
297297
m_outputCaps = adoptGRef(gst_caps_new_simple("audio/mpeg", "mpegversion", G_TYPE_INT, 1, "layer", G_TYPE_INT, 3, nullptr));

‎Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1588,69 +1588,69 @@ void fillVideoInfoColorimetryFromColorSpace(GstVideoInfo* info, const PlatformVi
15881588

15891589
void configureAudioDecoderForHarnessing(const GRefPtr<GstElement>& element)
15901590
{
1591-
if (gstObjectHasProperty(element.get(), "max-errors"))
1591+
if (gstObjectHasProperty(element.get(), "max-errors"_s))
15921592
g_object_set(element.get(), "max-errors", 0, nullptr);
15931593

15941594
// rawaudioparse-specific:
1595-
if (gstObjectHasProperty(element.get(), "use-sink-caps"))
1595+
if (gstObjectHasProperty(element.get(), "use-sink-caps"_s))
15961596
g_object_set(element.get(), "use-sink-caps", TRUE, nullptr);
15971597
}
15981598

15991599
void configureVideoDecoderForHarnessing(const GRefPtr<GstElement>& element)
16001600
{
1601-
if (gstObjectHasProperty(element.get(), "max-threads"))
1601+
if (gstObjectHasProperty(element.get(), "max-threads"_s))
16021602
g_object_set(element.get(), "max-threads", 1, nullptr);
16031603

1604-
if (gstObjectHasProperty(element.get(), "max-errors"))
1604+
if (gstObjectHasProperty(element.get(), "max-errors"_s))
16051605
g_object_set(element.get(), "max-errors", 0, nullptr);
16061606

16071607
// avdec-specific:
1608-
if (gstObjectHasProperty(element.get(), "std-compliance"))
1608+
if (gstObjectHasProperty(element.get(), "std-compliance"_s))
16091609
gst_util_set_object_arg(G_OBJECT(element.get()), "std-compliance", "strict");
16101610

1611-
if (gstObjectHasProperty(element.get(), "output-corrupt"))
1611+
if (gstObjectHasProperty(element.get(), "output-corrupt"_s))
16121612
g_object_set(element.get(), "output-corrupt", FALSE, nullptr);
16131613

16141614
// dav1ddec-specific:
1615-
if (gstObjectHasProperty(element.get(), "n-threads"))
1615+
if (gstObjectHasProperty(element.get(), "n-threads"_s))
16161616
g_object_set(element.get(), "n-threads", 1, nullptr);
16171617
}
16181618

16191619
void configureMediaStreamVideoDecoder(GstElement* element)
16201620
{
1621-
if (gstObjectHasProperty(element, "automatic-request-sync-points"))
1621+
if (gstObjectHasProperty(element, "automatic-request-sync-points"_s))
16221622
g_object_set(element, "automatic-request-sync-points", TRUE, nullptr);
16231623

1624-
if (gstObjectHasProperty(element, "discard-corrupted-frames"))
1624+
if (gstObjectHasProperty(element, "discard-corrupted-frames"_s))
16251625
g_object_set(element, "discard-corrupted-frames", TRUE, nullptr);
16261626

1627-
if (gstObjectHasProperty(element, "output-corrupt"))
1627+
if (gstObjectHasProperty(element, "output-corrupt"_s))
16281628
g_object_set(element, "output-corrupt", FALSE, nullptr);
16291629

1630-
if (gstObjectHasProperty(element, "max-errors"))
1630+
if (gstObjectHasProperty(element, "max-errors"_s))
16311631
g_object_set(element, "max-errors", -1, nullptr);
16321632
}
16331633

16341634
void configureVideoRTPDepayloader(GstElement* element)
16351635
{
1636-
if (gstObjectHasProperty(element, "request-keyframe"))
1636+
if (gstObjectHasProperty(element, "request-keyframe"_s))
16371637
g_object_set(element, "request-keyframe", TRUE, nullptr);
16381638

1639-
if (gstObjectHasProperty(element, "wait-for-keyframe"))
1639+
if (gstObjectHasProperty(element, "wait-for-keyframe"_s))
16401640
g_object_set(element, "wait-for-keyframe", TRUE, nullptr);
16411641
}
16421642

1643-
static bool gstObjectHasProperty(GstObject* gstObject, const char* name)
1643+
static bool gstObjectHasProperty(GstObject* gstObject, ASCIILiteral name)
16441644
{
1645-
return g_object_class_find_property(G_OBJECT_GET_CLASS(gstObject), name);
1645+
return g_object_class_find_property(G_OBJECT_GET_CLASS(gstObject), name.characters());
16461646
}
16471647

1648-
bool gstObjectHasProperty(GstElement* element, const char* name)
1648+
bool gstObjectHasProperty(GstElement* element, ASCIILiteral name)
16491649
{
16501650
return gstObjectHasProperty(GST_OBJECT_CAST(element), name);
16511651
}
16521652

1653-
bool gstObjectHasProperty(GstPad* pad, const char* name)
1653+
bool gstObjectHasProperty(GstPad* pad, ASCIILiteral name)
16541654
{
16551655
return gstObjectHasProperty(GST_OBJECT_CAST(pad), name);
16561656
}

‎Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ void configureVideoDecoderForHarnessing(const GRefPtr<GstElement>&);
311311
void configureMediaStreamVideoDecoder(GstElement*);
312312
void configureVideoRTPDepayloader(GstElement*);
313313

314-
bool gstObjectHasProperty(GstElement*, const char* name);
315-
bool gstObjectHasProperty(GstPad*, const char* name);
314+
bool gstObjectHasProperty(GstElement*, ASCIILiteral name);
315+
bool gstObjectHasProperty(GstPad*, ASCIILiteral name);
316316

317317
GRefPtr<GstBuffer> wrapSpanData(const std::span<const uint8_t>&);
318318

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3501,11 +3501,11 @@ void MediaPlayerPrivateGStreamer::configureVideoDecoder(GstElement* decoder)
35013501
// Set the decoder maximum number of threads to a low, fixed value, not depending on the
35023502
// platform. This also helps with processing metrics gathering. When using the default value
35033503
// the decoder introduces artificial processing latency reflecting the maximum number of threads.
3504-
if (gstObjectHasProperty(decoder, "max-threads"))
3504+
if (gstObjectHasProperty(decoder, "max-threads"_s))
35053505
g_object_set(decoder, "max-threads", 2, nullptr);
35063506
}
35073507

3508-
if (gstObjectHasProperty(decoder, "max-errors"))
3508+
if (gstObjectHasProperty(decoder, "max-errors"_s))
35093509
g_object_set(decoder, "max-errors", 0, nullptr);
35103510

35113511
#if USE(TEXTURE_MAPPER)
@@ -4549,7 +4549,7 @@ GstElement* MediaPlayerPrivateGStreamer::createVideoSink()
45494549
g_value_unset(&value);
45504550
}
45514551

4552-
if (gstObjectHasProperty(sink, "max-lateness")) {
4552+
if (gstObjectHasProperty(sink, "max-lateness"_s)) {
45534553
uint64_t maxLateness = 100 * GST_MSECOND;
45544554
g_object_set(sink, "max-lateness", maxLateness, nullptr);
45554555
} else {

‎Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ bool MediaPlayerPrivateGStreamerMSE::doSeek(const SeekTarget& target, float rate
315315
sink = GST_ELEMENT(g_value_get_object(&value));
316316
g_value_unset(&value);
317317
}
318-
if (gstObjectHasProperty(sink.get(), "async"))
318+
if (gstObjectHasProperty(sink.get(), "async"_s))
319319
g_object_get(sink.get(), "async", &audioSinkPerformsAsyncStateChanges, nullptr);
320320
if (!audioSinkPerformsAsyncStateChanges) {
321321
// If audio-only pipeline's sink is not performing async state changes

‎Source/WebCore/platform/gstreamer/GStreamerHolePunchQuirkBcmNexus.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace WebCore {
3030

3131
bool GStreamerHolePunchQuirkBcmNexus::setHolePunchVideoRectangle(GstElement* videoSink, const IntRect& rect)
3232
{
33-
if (UNLIKELY(!gstObjectHasProperty(videoSink, "rectangle")))
33+
if (UNLIKELY(!gstObjectHasProperty(videoSink, "rectangle"_s)))
3434
return false;
3535

3636
auto rectString = makeString(rect.x(), ',', rect.y(), ',', rect.width(), ',', rect.height());

‎Source/WebCore/platform/gstreamer/GStreamerHolePunchQuirkRialto.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ GstElement* GStreamerHolePunchQuirkRialto::createHolePunchVideoSink(bool isLegac
5050

5151
bool GStreamerHolePunchQuirkRialto::setHolePunchVideoRectangle(GstElement* videoSink, const IntRect& rect)
5252
{
53-
if (UNLIKELY(!gstObjectHasProperty(videoSink, "rectangle")))
53+
if (UNLIKELY(!gstObjectHasProperty(videoSink, "rectangle"_s)))
5454
return false;
5555

5656
auto rectString = makeString(rect.x(), ',', rect.y(), ',', rect.width(), ',', rect.height());

‎Source/WebCore/platform/gstreamer/GStreamerHolePunchQuirkWesteros.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ GstElement* GStreamerHolePunchQuirkWesteros::createHolePunchVideoSink(bool isLeg
5353

5454
bool GStreamerHolePunchQuirkWesteros::setHolePunchVideoRectangle(GstElement* videoSink, const IntRect& rect)
5555
{
56-
if (UNLIKELY(!gstObjectHasProperty(videoSink, "rectangle")))
56+
if (UNLIKELY(!gstObjectHasProperty(videoSink, "rectangle"_s)))
5757
return false;
5858

5959
auto rectString = makeString(rect.x(), ',', rect.y(), ',', rect.width(), ',', rect.height());

‎Source/WebCore/platform/gstreamer/GStreamerQuirkAmLogic.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ GstElement* GStreamerQuirkAmLogic::createWebAudioSink()
5656

5757
void GStreamerQuirkAmLogic::configureElement(GstElement* element, const OptionSet<ElementRuntimeCharacteristics>& characteristics)
5858
{
59-
if (gstObjectHasProperty(element, "disable-xrun")) {
59+
if (gstObjectHasProperty(element, "disable-xrun"_s)) {
6060
GST_INFO("Set property disable-xrun to TRUE");
6161
g_object_set(element, "disable-xrun", TRUE, nullptr);
6262
}
6363

64-
if (characteristics.contains(ElementRuntimeCharacteristics::HasVideo) && gstObjectHasProperty(element, "wait-video")) {
64+
if (characteristics.contains(ElementRuntimeCharacteristics::HasVideo) && gstObjectHasProperty(element, "wait-video"_s)) {
6565
GST_INFO("Set property wait-video to TRUE");
6666
g_object_set(element, "wait-video", TRUE, nullptr);
6767
}

0 commit comments

Comments
 (0)