diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2021-08-18 19:40:55 -0400 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2021-09-15 16:35:09 +0000 |
| commit | fd93c1ac197fc98ed896afab7414b91b383039d2 (patch) | |
| tree | 486d21adea4de38a2315845eec325cedf902cbd2 | |
| parent | 98f2a84a289ed4d4cfac9bc5c73182a56eefa99c (diff) | |
| download | gstreamer-plugins-base-fd93c1ac197fc98ed896afab7414b91b383039d2.tar.gz | |
rtphdrext: Make write function return a signed value
Since the return value is documented to possibly be smaller than 0,
then it needs to be signed.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1258>
| -rw-r--r-- | gst-libs/gst/rtp/gstrtpbasepayload.c | 2 | ||||
| -rw-r--r-- | gst-libs/gst/rtp/gstrtphdrext.c | 2 | ||||
| -rw-r--r-- | gst-libs/gst/rtp/gstrtphdrext.h | 4 | ||||
| -rw-r--r-- | tests/check/libs/rtpdummyhdrextimpl.c | 4 | ||||
| -rw-r--r-- | tests/check/libs/rtphdrext.c | 3 |
5 files changed, 8 insertions, 7 deletions
diff --git a/gst-libs/gst/rtp/gstrtpbasepayload.c b/gst-libs/gst/rtp/gstrtpbasepayload.c index d092fc75e..e72469cca 100644 --- a/gst-libs/gst/rtp/gstrtpbasepayload.c +++ b/gst-libs/gst/rtp/gstrtpbasepayload.c @@ -1641,7 +1641,7 @@ write_header_extension (GstRTPHeaderExtension * ext, gpointer user_data) gsize remaining = hdr->allocated_size - hdr->written_size - hdr->hdr_unit_size; gsize offset = hdr->written_size + hdr->hdr_unit_size; - gsize written; + gssize written; guint ext_id; if (hdr->abort) diff --git a/gst-libs/gst/rtp/gstrtphdrext.c b/gst-libs/gst/rtp/gstrtphdrext.c index 6e5921a3a..44649dfd3 100644 --- a/gst-libs/gst/rtp/gstrtphdrext.c +++ b/gst-libs/gst/rtp/gstrtphdrext.c @@ -279,7 +279,7 @@ gst_rtp_header_extension_get_max_size (GstRTPHeaderExtension * ext, * * Since: 1.20 */ -gsize +gssize gst_rtp_header_extension_write (GstRTPHeaderExtension * ext, const GstBuffer * input_meta, GstRTPHeaderExtensionFlags write_flags, GstBuffer * output, guint8 * data, gsize size) diff --git a/gst-libs/gst/rtp/gstrtphdrext.h b/gst-libs/gst/rtp/gstrtphdrext.h index fe9a5492e..d68a25d9d 100644 --- a/gst-libs/gst/rtp/gstrtphdrext.h +++ b/gst-libs/gst/rtp/gstrtphdrext.h @@ -159,7 +159,7 @@ struct _GstRTPHeaderExtensionClass gsize (*get_max_size) (GstRTPHeaderExtension * ext, const GstBuffer * input_meta); - gsize (*write) (GstRTPHeaderExtension * ext, + gssize (*write) (GstRTPHeaderExtension * ext, const GstBuffer * input_meta, GstRTPHeaderExtensionFlags write_flags, GstBuffer * output, @@ -210,7 +210,7 @@ GST_RTP_API void gst_rtp_header_extension_set_id (GstRTPHeaderExtension * ext, guint ext_id); GST_RTP_API -gsize gst_rtp_header_extension_write (GstRTPHeaderExtension * ext, +gssize gst_rtp_header_extension_write (GstRTPHeaderExtension * ext, const GstBuffer * input_meta, GstRTPHeaderExtensionFlags write_flags, GstBuffer * output, diff --git a/tests/check/libs/rtpdummyhdrextimpl.c b/tests/check/libs/rtpdummyhdrextimpl.c index e5d09af0d..3144a7c48 100644 --- a/tests/check/libs/rtpdummyhdrextimpl.c +++ b/tests/check/libs/rtpdummyhdrextimpl.c @@ -74,7 +74,7 @@ static GstRTPHeaderExtensionFlags gst_rtp_dummy_hdr_ext_get_supported_flags (GstRTPHeaderExtension * ext); static gsize gst_rtp_dummy_hdr_ext_get_max_size (GstRTPHeaderExtension * ext, const GstBuffer * input_meta); -static gsize gst_rtp_dummy_hdr_ext_write (GstRTPHeaderExtension * ext, +static gssize gst_rtp_dummy_hdr_ext_write (GstRTPHeaderExtension * ext, const GstBuffer * input_meta, GstRTPHeaderExtensionFlags write_flags, GstBuffer * output, guint8 * data, gsize size); static gboolean gst_rtp_dummy_hdr_ext_read (GstRTPHeaderExtension * ext, @@ -168,7 +168,7 @@ gst_rtp_dummy_hdr_ext_get_max_size (GstRTPHeaderExtension * ext, #define TEST_DATA_BYTE 0x9d -static gsize +static gssize gst_rtp_dummy_hdr_ext_write (GstRTPHeaderExtension * ext, const GstBuffer * input_meta, GstRTPHeaderExtensionFlags write_flags, GstBuffer * output, guint8 * data, gsize size) diff --git a/tests/check/libs/rtphdrext.c b/tests/check/libs/rtphdrext.c index 5b2e67152..12464d222 100644 --- a/tests/check/libs/rtphdrext.c +++ b/tests/check/libs/rtphdrext.c @@ -35,7 +35,8 @@ GST_START_TEST (rtp_header_ext_write) GstRTPHeaderExtension *dummy; GstBuffer *buffer; guint8 *data; - gsize size, written; + gsize size; + gssize written; dummy = rtp_dummy_hdr_ext_new (); gst_rtp_header_extension_set_id (dummy, 1); |