summaryrefslogtreecommitdiff
path: root/gst/rtmp2
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig) <jsteffens@make.tv>2020-02-12 18:27:56 +0100
committerGStreamer Merge Bot <gitlab-merge-bot@gstreamer-foundation.org>2020-02-21 15:20:41 +0000
commit11a1de0053e02780a931e2dd28955a55462ed9a9 (patch)
tree82cb0edc752e402c3e91a48e5968632bdac667cf /gst/rtmp2
parent279e3c333cdf731cf66b1b4d16d099257d273cd2 (diff)
downloadgstreamer-plugins-bad-11a1de0053e02780a931e2dd28955a55462ed9a9.tar.gz
rtmp2: rtmpconnection: Use more appropriate size types
- guint32 for chunk size and window size - guint64 for running counters
Diffstat (limited to 'gst/rtmp2')
-rw-r--r--gst/rtmp2/rtmp/rtmpconnection.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/gst/rtmp2/rtmp/rtmpconnection.c b/gst/rtmp2/rtmp/rtmpconnection.c
index 633ea1f1b..8863d32a6 100644
--- a/gst/rtmp2/rtmp/rtmpconnection.c
+++ b/gst/rtmp2/rtmp/rtmpconnection.c
@@ -74,12 +74,13 @@ struct _GstRtmpConnection
gboolean writing;
/* RTMP configuration */
- gsize in_chunk_size;
- gsize out_chunk_size;
- gsize in_window_ack_size;
- gsize out_window_ack_size;
- gsize total_input_bytes;
- gsize bytes_since_ack;
+ guint32 in_chunk_size;
+ guint32 out_chunk_size;
+ guint32 in_window_ack_size;
+ guint32 out_window_ack_size;
+
+ guint64 in_bytes_total;
+ guint64 in_bytes_unacked;
};
@@ -444,9 +445,9 @@ gst_rtmp_connection_input_ready (GInputStream * is, gpointer user_data)
GST_TRACE_OBJECT (sc, "read %" G_GSIZE_FORMAT " bytes", ret);
- sc->total_input_bytes += ret;
- sc->bytes_since_ack += ret;
- if (sc->bytes_since_ack >= sc->in_window_ack_size) {
+ sc->in_bytes_total += ret;
+ sc->in_bytes_unacked += ret;
+ if (sc->in_bytes_unacked >= sc->in_window_ack_size) {
gst_rtmp_connection_send_ack (sc);
}
@@ -989,13 +990,13 @@ gst_rtmp_connection_send_ack (GstRtmpConnection * connection)
{
GstRtmpProtocolControl pc = {
.type = GST_RTMP_MESSAGE_TYPE_ACKNOWLEDGEMENT,
- .param = (guint32) connection->total_input_bytes,
+ .param = (guint32) connection->in_bytes_total,
};
gst_rtmp_connection_queue_message (connection,
gst_rtmp_message_new_protocol_control (&pc));
- connection->bytes_since_ack = 0;
+ connection->in_bytes_unacked = 0;
}
static void