Skip to content

Commit a6e4e27

Browse files
committed
[GStreamer] Switch doCapsHaveType to ASCIILiteral
https://bugs.webkit.org/show_bug.cgi?id=289896 Reviewed by Philippe Normand. * Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp: (WebCore::AudioFileReader::plugDeinterleave): * Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp: (WebCore::AudioSourceProviderGStreamer::AudioSourceProviderGStreamer): * Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp: (WebCore::doCapsHaveType): * Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h: * Source/WebCore/platform/graphics/gstreamer/ImageDecoderGStreamer.cpp: (WebCore::ImageDecoderGStreamer::ImageDecoderGStreamer): * Source/WebCore/platform/mediastream/gstreamer/GStreamerIncomingTrackProcessor.cpp: (WebCore::GStreamerIncomingTrackProcessor::configure): * Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp: Canonical link: https://commits.webkit.org/292297@main Signed-off-by: Xabier Rodriguez Calvar <calvaris@igalia.com>
1 parent 9c69f13 commit a6e4e27

7 files changed

Lines changed: 11 additions & 11 deletions

File tree

Source/WebCore/platform/audio/gstreamer/AudioFileReaderGStreamer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ void AudioFileReader::plugDeinterleave(GstPad* pad)
346346
return;
347347

348348
auto padCaps = adoptGRef(gst_pad_query_caps(pad, nullptr));
349-
if (!doCapsHaveType(padCaps.get(), "audio/x-raw"))
349+
if (!doCapsHaveType(padCaps.get(), "audio/x-raw"_s))
350350
return;
351351

352352
// A decodebin pad was added, plug in a deinterleave element to

Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ AudioSourceProviderGStreamer::AudioSourceProviderGStreamer(MediaStreamTrackPriva
123123

124124
g_signal_connect_swapped(decodebin, "pad-added", G_CALLBACK(+[](AudioSourceProviderGStreamer* provider, GstPad* pad) {
125125
auto padCaps = adoptGRef(gst_pad_query_caps(pad, nullptr));
126-
bool isAudio = doCapsHaveType(padCaps.get(), "audio");
126+
bool isAudio = doCapsHaveType(padCaps.get(), "audio"_s);
127127
RELEASE_ASSERT(isAudio);
128128

129129
auto sinkPad = adoptGRef(gst_element_get_static_pad(provider->m_audioSinkBin.get(), "sink"));

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,14 +297,14 @@ StringView capsMediaType(const GstCaps* caps)
297297
return gstStructureGetName(structure);
298298
}
299299

300-
bool doCapsHaveType(const GstCaps* caps, const char* type)
300+
bool doCapsHaveType(const GstCaps* caps, ASCIILiteral type)
301301
{
302302
auto mediaType = capsMediaType(caps);
303303
if (!mediaType) {
304304
GST_WARNING("Failed to get MediaType");
305305
return false;
306306
}
307-
return mediaType.startsWith(span(type));
307+
return mediaType.startsWith(type);
308308
}
309309

310310
bool areEncryptedCaps(const GstCaps* caps)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ inline bool webkitGstCheckVersion(guint major, guint minor, guint micro)
6262
return true;
6363
}
6464

65-
#define GST_VIDEO_CAPS_TYPE_PREFIX "video/"
66-
#define GST_AUDIO_CAPS_TYPE_PREFIX "audio/"
67-
#define GST_TEXT_CAPS_TYPE_PREFIX "text/"
65+
#define GST_VIDEO_CAPS_TYPE_PREFIX "video/"_s
66+
#define GST_AUDIO_CAPS_TYPE_PREFIX "audio/"_s
67+
#define GST_TEXT_CAPS_TYPE_PREFIX "text/"_s
6868

6969
WARN_UNUSED_RETURN GstPad* webkitGstGhostPadFromStaticTemplate(GstStaticPadTemplate*, ASCIILiteral name, GstPad* target);
7070
#if ENABLE(VIDEO)
@@ -76,7 +76,7 @@ StringView capsMediaType(const GstCaps*);
7676
std::optional<TrackID> getStreamIdFromPad(const GRefPtr<GstPad>&);
7777
std::optional<TrackID> getStreamIdFromStream(const GRefPtr<GstStream>&);
7878
std::optional<TrackID> parseStreamId(StringView stringId);
79-
bool doCapsHaveType(const GstCaps*, const char*);
79+
bool doCapsHaveType(const GstCaps*, ASCIILiteral);
8080
bool areEncryptedCaps(const GstCaps*);
8181
Vector<String> extractGStreamerOptionsFromCommandLine();
8282
void setGStreamerOptionsFromUIProcess(Vector<String>&&);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ ImageDecoderGStreamer::ImageDecoderGStreamer(FragmentedSharedBuffer& data, const
124124
auto caps = adoptGRef(gst_pad_query_caps(pad.get(), nullptr));
125125
auto identityHarness = GStreamerElementHarness::create(GRefPtr<GstElement>(gst_element_factory_make("identity", nullptr)), [](auto&, const auto&) { });
126126
GST_DEBUG_OBJECT(pad.get(), "Caps on parser source pad: %" GST_PTR_FORMAT, caps.get());
127-
if (!caps || !doCapsHaveType(caps.get(), "video")) {
127+
if (!caps || !doCapsHaveType(caps.get(), "video"_s)) {
128128
GST_WARNING_OBJECT(m_decoderHarness->element(), "Ignoring non-video track");
129129
return identityHarness;
130130
}

Source/WebCore/platform/mediastream/gstreamer/GStreamerIncomingTrackProcessor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void GStreamerIncomingTrackProcessor::configure(ThreadSafeWeakPtr<GStreamerMedia
4949
caps = adoptGRef(gst_pad_query_caps(m_pad.get(), nullptr));
5050

5151
ASCIILiteral typeName;
52-
if (doCapsHaveType(caps.get(), "audio")) {
52+
if (doCapsHaveType(caps.get(), "audio"_s)) {
5353
typeName = "audio"_s;
5454
m_data.type = RealtimeMediaSource::Type::Audio;
5555
} else {

Source/WebCore/platform/mediastream/gstreamer/GStreamerMediaStreamSource.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ class InternalSource final : public MediaStreamTrackPrivateObserver,
400400

401401
if (m_isVideoTrack && drop) {
402402
auto* caps = gst_sample_get_caps(sample.get());
403-
drop = doCapsHaveType(caps, "video") || GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT);
403+
drop = doCapsHaveType(caps, "video"_s) || GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT);
404404
}
405405

406406
if (drop) {

0 commit comments

Comments
 (0)