Diff
Modified: trunk/Source/WebCore/ChangeLog (248039 => 248040)
--- trunk/Source/WebCore/ChangeLog 2019-07-31 14:41:16 UTC (rev 248039)
+++ trunk/Source/WebCore/ChangeLog 2019-07-31 14:47:32 UTC (rev 248040)
@@ -1,3 +1,18 @@
+2019-07-31 Loïc Yhuel <[email protected]>
+
+ [GStreamer] Fix printf format warnings for 32-bit build in GST traces
+ https://bugs.webkit.org/show_bug.cgi?id=200299
+
+ Reviewed by Xabier Rodriguez-Calvar.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::handleSyncMessage): %zu for size_t
+ (WebCore::MediaPlayerPrivateGStreamerBase::initializationDataEncountered): Ditto
+ * platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:
+ (webKitWebSrcCreate): G_GUINT64_FORMAT for uint64_t
+ * platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp: G_GINT64_FORMAT for int64_t
+ * platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp: Ditto
+
2019-07-31 Andres Gonzalez <[email protected]>
AX: Re-enable accessibility/set-selected-text-range-after-newline.html test.
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (248039 => 248040)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2019-07-31 14:41:16 UTC (rev 248039)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2019-07-31 14:47:32 UTC (rev 248040)
@@ -338,7 +338,7 @@
GST_DEBUG_OBJECT(pipeline(), "handling drm-preferred-decryption-system-id need context message");
LockHolder lock(m_protectionMutex);
ProtectionSystemEvents protectionSystemEvents(message);
- GST_TRACE("found %lu protection events, %lu decryptors available", protectionSystemEvents.events().size(), protectionSystemEvents.availableSystems().size());
+ GST_TRACE("found %zu protection events, %zu decryptors available", protectionSystemEvents.events().size(), protectionSystemEvents.availableSystems().size());
InitData initData;
for (auto& event : protectionSystemEvents.events()) {
@@ -1277,7 +1277,7 @@
if (!weakThis)
return;
- GST_DEBUG("scheduling initializationDataEncountered event of size %lu", initData.payload()->size());
+ GST_DEBUG("scheduling initializationDataEncountered event of size %zu", initData.payload()->size());
GST_MEMDUMP("init datas", reinterpret_cast<const uint8_t*>(initData.payload()->data()), initData.payload()->size());
weakThis->m_player->initializationDataEncountered(initData.payloadContainerType(), initData.payload()->tryCreateArrayBuffer());
});
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp (248039 => 248040)
--- trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2019-07-31 14:41:16 UTC (rev 248039)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp 2019-07-31 14:47:32 UTC (rev 248040)
@@ -390,7 +390,7 @@
});
}
- GST_TRACE_OBJECT(src, "flushing: %s, doesHaveEOS: %s, queueSize: %" G_GSIZE_FORMAT ", isDownloadSuspended: %s",
+ GST_TRACE_OBJECT(src, "flushing: %s, doesHaveEOS: %s, queueSize: %" G_GUINT64_FORMAT ", isDownloadSuspended: %s",
boolForPrinting(priv->isFlushing), boolForPrinting(priv->doesHaveEOS), priv->queueSize,
boolForPrinting(priv->isDownloadSuspended));
Modified: trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp (248039 => 248040)
--- trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp 2019-07-31 14:41:16 UTC (rev 248039)
+++ trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoDecoderFactory.cpp 2019-07-31 14:47:32 UTC (rev 248040)
@@ -184,7 +184,7 @@
m_dtsPtsMap[GST_BUFFER_PTS(buffer.get())] = timestamps;
}
- GST_LOG_OBJECT(pipeline(), "%ld Decoding: %" GST_PTR_FORMAT, renderTimeMs, buffer.get());
+ GST_LOG_OBJECT(pipeline(), "%" G_GINT64_FORMAT " Decoding: %" GST_PTR_FORMAT, renderTimeMs, buffer.get());
auto sample = adoptGRef(gst_sample_new(buffer.get(), GetCapsForFrame(inputImage), nullptr, nullptr));
switch (gst_app_src_push_sample(GST_APP_SRC(m_src), sample.get())) {
case GST_FLOW_OK:
Modified: trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp (248039 => 248040)
--- trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp 2019-07-31 14:41:16 UTC (rev 248039)
+++ trunk/Source/WebCore/platform/mediastream/libwebrtc/GStreamerVideoEncoderFactory.cpp 2019-07-31 14:47:32 UTC (rev 248040)
@@ -268,7 +268,7 @@
m_encodedFrame.capture_time_ms_ = frame.render_time_ms();
m_encodedFrame.SetTimestamp(frame.timestamp());
- GST_LOG_OBJECT(m_pipeline.get(), "Got buffer capture_time_ms: %ld _timestamp: %u",
+ GST_LOG_OBJECT(m_pipeline.get(), "Got buffer capture_time_ms: %" G_GINT64_FORMAT " _timestamp: %u",
m_encodedFrame.capture_time_ms_, m_encodedFrame.Timestamp());
webrtc::CodecSpecificInfo codecInfo;
