From bf00524c41ff9e8749c0daeab330457cb99b2a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 29 Oct 2024 16:43:33 +0000 Subject: [PATCH] rtppassthrough: fix rtp-stats message compatibility with GstRTPBasePayload "clock-rate" and "pt" are G_TYPE_UINT in the base class, so let's keep them like that here too, since the entire purposes of the passthrough element is to fake being a payloader. The types in the message don't have to be consistent with the types in the caps. Reverts part of commit a6fa53b7 of !7526 https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7552#note_2576653 Part-of: --- subprojects/gst-plugins-good/docs/gst_plugins_cache.json | 2 +- subprojects/gst-plugins-good/gst/rtp/gstrtppassthroughpay.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/subprojects/gst-plugins-good/docs/gst_plugins_cache.json b/subprojects/gst-plugins-good/docs/gst_plugins_cache.json index 16008ded35..04b8cd634f 100644 --- a/subprojects/gst-plugins-good/docs/gst_plugins_cache.json +++ b/subprojects/gst-plugins-good/docs/gst_plugins_cache.json @@ -16378,7 +16378,7 @@ "construct": false, "construct-only": false, "controllable": false, - "default": "application/x-rtp-payload-stats, clock-rate=(int)0, running-time=(guint64)0, seqnum=(uint)0, timestamp=(uint)0, ssrc=(uint)0, pt=(int)128, seqnum-offset=(uint)0, timestamp-offset=(uint)0;", + "default": "application/x-rtp-payload-stats, clock-rate=(uint)0, running-time=(guint64)0, seqnum=(uint)0, timestamp=(uint)0, ssrc=(uint)0, pt=(uint)128, seqnum-offset=(uint)0, timestamp-offset=(uint)0;", "mutable": "null", "readable": true, "type": "GstStructure", diff --git a/subprojects/gst-plugins-good/gst/rtp/gstrtppassthroughpay.c b/subprojects/gst-plugins-good/gst/rtp/gstrtppassthroughpay.c index 48514ff20f..b4ba9e9a21 100644 --- a/subprojects/gst-plugins-good/gst/rtp/gstrtppassthroughpay.c +++ b/subprojects/gst-plugins-good/gst/rtp/gstrtppassthroughpay.c @@ -555,10 +555,10 @@ gst_rtp_passthrough_pay_create_stats (GstRtpPassthroughPay * self) } return gst_structure_new ("application/x-rtp-payload-stats", "clock-rate", - G_TYPE_INT, self->clock_rate, "running-time", G_TYPE_UINT64, + G_TYPE_UINT, (guint) self->clock_rate, "running-time", G_TYPE_UINT64, running_time, "seqnum", G_TYPE_UINT, (guint) self->seqnum, "timestamp", G_TYPE_UINT, (guint) self->timestamp, "ssrc", G_TYPE_UINT, self->ssrc, - "pt", G_TYPE_INT, self->pt, "seqnum-offset", G_TYPE_UINT, + "pt", G_TYPE_UINT, self->pt, "seqnum-offset", G_TYPE_UINT, (guint) self->seqnum_offset, "timestamp-offset", G_TYPE_UINT, (guint) self->timestamp_offset, NULL);