summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 618bf91)
raw | patch | inline | side by side (parent: 618bf91)
author | Thomas Vander Stichele <thomas@apestaart.org> | |
Wed, 19 May 2004 17:22:53 +0000 (17:22 +0000) | ||
committer | Thomas Vander Stichele <thomas@apestaart.org> | |
Wed, 19 May 2004 17:22:53 +0000 (17:22 +0000) |
Original commit message from CVS:
use GST macros; add asserts
use GST macros; add asserts
diff --git a/ChangeLog b/ChangeLog
index 417d601797556fee0f121101aa75373d1cd7733a..799e88e16ded27a15864c04d6a4224a82cab8b05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
+2004-05-19 Thomas Vander Stichele <thomas at apestaart dot org>
+
+ * libs/gst/dataprotocol/Makefile.am:
+ * libs/gst/dataprotocol/dataprotocol.c:
+ (gst_dp_header_from_buffer), (gst_dp_packet_from_caps),
+ (gst_dp_packet_from_event), (gst_dp_event_from_packet):
+ * libs/gst/dataprotocol/dp-private.h:
+ use GST macros to read/write fixed length ints
+ add some more asserts
+
2004-05-19 Thomas Vander Stichele <thomas at apestaart dot org>
* docs/libs/gstreamer-libs-docs.sgml:
index cf6c76792f23a93487a124f60b102ab8e56c784a..d2e8db66997af0de013767c019a4409ccb9f5736 100644 (file)
check_PROGRAMS = dataprotocol-test
dataprotocol_test_SOURCES = dataprotocol-test.c dataprotocol.c
dataprotocol_test_CFLAGS = $(GST_LIB_CFLAGS) -I$(top_srcdir)/libs
-dataprotocol_test_LDADD = $(GST_LIB_LIBS)
+dataprotocol_test_LDADD = $(GST_OBJ_LIBS)
index cabba42c57f40d2e656e2d52f28f50ed941e1a85..85c798e929d468a1f9f83c82d2f4c79954ee9873 100644 (file)
GST_DEBUG_CATEGORY (data_protocol_debug);
#define GST_CAT_DEFAULT data_protocol_debug
-/*** private functions ***/
-
-#define GST_DP_WRITE_GUINT64(buf, value) (*((guint64 *) (buf)) = GUINT64_TO_BE (value))
-#define GST_DP_WRITE_GUINT32(buf, value) (*((guint32 *) (buf)) = GUINT32_TO_BE (value))
-#define GST_DP_WRITE_GUINT16(buf, value) (*((guint16 *) (buf)) = GUINT16_TO_BE (value))
-
/* calculate a CCITT 16 bit CRC check value for a given byte array */
/*
* this code snippet is adapted from a web page I found
g_return_val_if_fail (GST_IS_BUFFER (buffer), FALSE);
g_return_val_if_fail (GST_BUFFER_REFCOUNT_VALUE (buffer) > 0, FALSE);
+ g_return_val_if_fail (header, FALSE);
*length = GST_DP_HEADER_LENGTH;
h = g_malloc (GST_DP_HEADER_LENGTH);
h[3] = GST_DP_PAYLOAD_BUFFER;
/* buffer properties */
- GST_DP_WRITE_GUINT32 (h + 4, GST_BUFFER_SIZE (buffer));
- GST_DP_WRITE_GUINT64 (h + 8, GST_BUFFER_TIMESTAMP (buffer));
- GST_DP_WRITE_GUINT64 (h + 16, GST_BUFFER_DURATION (buffer));
- GST_DP_WRITE_GUINT64 (h + 24, GST_BUFFER_OFFSET (buffer));
- GST_DP_WRITE_GUINT64 (h + 32, GST_BUFFER_OFFSET_END (buffer));
+ GST_WRITE_UINT32_BE (h + 4, GST_BUFFER_SIZE (buffer));
+ GST_WRITE_UINT64_BE (h + 8, GST_BUFFER_TIMESTAMP (buffer));
+ GST_WRITE_UINT64_BE (h + 16, GST_BUFFER_DURATION (buffer));
+ GST_WRITE_UINT64_BE (h + 24, GST_BUFFER_OFFSET (buffer));
+ GST_WRITE_UINT64_BE (h + 32, GST_BUFFER_OFFSET_END (buffer));
/* ABI padding */
- GST_DP_WRITE_GUINT64 (h + 40, (guint64) 0);
- GST_DP_WRITE_GUINT64 (h + 48, (guint64) 0);
+ GST_WRITE_UINT64_BE (h + 40, (guint64) 0);
+ GST_WRITE_UINT64_BE (h + 48, (guint64) 0);
/* CRC */
crc = 0;
/* we don't crc the last four bytes of the header since they are crc's */
crc = gst_dp_crc (h, 56);
}
- GST_DP_WRITE_GUINT16 (h + 56, crc);
+ GST_WRITE_UINT16_BE (h + 56, crc);
crc = 0;
if (flags & GST_DP_HEADER_FLAG_CRC_PAYLOAD) {
crc = gst_dp_crc (GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer));
}
- GST_DP_WRITE_GUINT16 (h + 58, crc);
+ GST_WRITE_UINT16_BE (h + 58, crc);
GST_LOG ("created header from buffer:");
gst_dp_dump_byte_array (h, GST_DP_HEADER_LENGTH);
/* FIXME: GST_IS_CAPS doesn't work
g_return_val_if_fail (GST_IS_CAPS (caps), FALSE); */
+ g_return_val_if_fail (caps, FALSE);
+ g_return_val_if_fail (header, FALSE);
+ g_return_val_if_fail (payload, FALSE);
*length = GST_DP_HEADER_LENGTH;
h = g_malloc (GST_DP_HEADER_LENGTH);
h[3] = GST_DP_PAYLOAD_CAPS;
/* buffer properties */
- GST_DP_WRITE_GUINT32 (h + 4, strlen (string) + 1); /* include trailing 0 */
- GST_DP_WRITE_GUINT64 (h + 8, (guint64) 0);
- GST_DP_WRITE_GUINT64 (h + 16, (guint64) 0);
- GST_DP_WRITE_GUINT64 (h + 24, (guint64) 0);
- GST_DP_WRITE_GUINT64 (h + 32, (guint64) 0);
+ GST_WRITE_UINT32_BE (h + 4, strlen (string) + 1); /* include trailing 0 */
+ GST_WRITE_UINT64_BE (h + 8, (guint64) 0);
+ GST_WRITE_UINT64_BE (h + 16, (guint64) 0);
+ GST_WRITE_UINT64_BE (h + 24, (guint64) 0);
+ GST_WRITE_UINT64_BE (h + 32, (guint64) 0);
/* ABI padding */
- GST_DP_WRITE_GUINT64 (h + 40, (guint64) 0);
- GST_DP_WRITE_GUINT64 (h + 48, (guint64) 0);
+ GST_WRITE_UINT64_BE (h + 40, (guint64) 0);
+ GST_WRITE_UINT64_BE (h + 48, (guint64) 0);
/* CRC */
crc = 0;
if (flags & GST_DP_HEADER_FLAG_CRC_HEADER) {
crc = gst_dp_crc (h, 56);
}
- GST_DP_WRITE_GUINT16 (h + 56, crc);
+ GST_WRITE_UINT16_BE (h + 56, crc);
crc = 0;
if (flags & GST_DP_HEADER_FLAG_CRC_PAYLOAD) {
crc = gst_dp_crc (string, strlen (string) + 1);
}
- GST_DP_WRITE_GUINT16 (h + 58, crc);
+ GST_WRITE_UINT16_BE (h + 58, crc);
GST_LOG ("created header from caps:");
gst_dp_dump_byte_array (h, GST_DP_HEADER_LENGTH);
{
guint8 *h;
guint16 crc;
- gchar *string = NULL;
guint pl_length; /* length of payload */
+ g_return_val_if_fail (event, FALSE);
g_return_val_if_fail (GST_IS_EVENT (event), FALSE);
+ g_return_val_if_fail (header, FALSE);
+ g_return_val_if_fail (payload, FALSE);
*length = GST_DP_HEADER_LENGTH;
h = g_malloc0 (GST_DP_HEADER_LENGTH);
case GST_EVENT_FLUSH:
case GST_EVENT_EMPTY:
case GST_EVENT_DISCONTINUOUS:
- GST_DP_WRITE_GUINT64 (h + 8, GST_EVENT_TIMESTAMP (event));
+ GST_WRITE_UINT64_BE (h + 8, GST_EVENT_TIMESTAMP (event));
pl_length = 0;
*payload = NULL;
break;
case GST_EVENT_SEEK:
pl_length = 4 + 8 + 4;
*payload = g_malloc0 (pl_length);
- GST_DP_WRITE_GUINT32 (*payload, (guint32) GST_EVENT_SEEK_TYPE (event));
- GST_DP_WRITE_GUINT64 (*payload + 4,
+ GST_WRITE_UINT32_BE (*payload, (guint32) GST_EVENT_SEEK_TYPE (event));
+ GST_WRITE_UINT64_BE (*payload + 4,
(guint64) GST_EVENT_SEEK_OFFSET (event));
- GST_DP_WRITE_GUINT32 (*payload + 12,
+ GST_WRITE_UINT32_BE (*payload + 12,
(guint32) GST_EVENT_SEEK_ACCURACY (event));
break;
case GST_EVENT_SEEK_SEGMENT:
pl_length = 4 + 8 + 8 + 4;
*payload = g_malloc0 (pl_length);
- GST_DP_WRITE_GUINT32 (*payload, (guint32) GST_EVENT_SEEK_TYPE (event));
- GST_DP_WRITE_GUINT64 (*payload + 4,
+ GST_WRITE_UINT32_BE (*payload, (guint32) GST_EVENT_SEEK_TYPE (event));
+ GST_WRITE_UINT64_BE (*payload + 4,
(guint64) GST_EVENT_SEEK_OFFSET (event));
- GST_DP_WRITE_GUINT64 (*payload + 12,
+ GST_WRITE_UINT64_BE (*payload + 12,
(guint64) GST_EVENT_SEEK_ENDOFFSET (event));
- GST_DP_WRITE_GUINT32 (*payload + 20,
+ GST_WRITE_UINT32_BE (*payload + 20,
(guint32) GST_EVENT_SEEK_ACCURACY (event));
break;
case GST_EVENT_QOS:
h[3] = GST_DP_PAYLOAD_EVENT_NONE + GST_EVENT_TYPE (event);
/* length */
- GST_DP_WRITE_GUINT32 (h + 4, (guint32) pl_length);
+ GST_WRITE_UINT32_BE (h + 4, (guint32) pl_length);
/* timestamp */
- GST_DP_WRITE_GUINT64 (h + 8, GST_EVENT_TIMESTAMP (event));
+ GST_WRITE_UINT64_BE (h + 8, GST_EVENT_TIMESTAMP (event));
/* ABI padding */
- GST_DP_WRITE_GUINT64 (h + 40, (guint64) 0);
- GST_DP_WRITE_GUINT64 (h + 48, (guint64) 0);
+ GST_WRITE_UINT64_BE (h + 40, (guint64) 0);
+ GST_WRITE_UINT64_BE (h + 48, (guint64) 0);
/* CRC */
crc = 0;
if (flags & GST_DP_HEADER_FLAG_CRC_HEADER) {
crc = gst_dp_crc (h, 56);
}
- GST_DP_WRITE_GUINT16 (h + 56, crc);
+ GST_WRITE_UINT16_BE (h + 56, crc);
crc = 0;
- if (flags & GST_DP_HEADER_FLAG_CRC_PAYLOAD) {
- crc = gst_dp_crc (string, strlen (string) + 1);
+ /* events can have a NULL payload */
+ if (*payload && flags & GST_DP_HEADER_FLAG_CRC_PAYLOAD) {
+ crc = gst_dp_crc (*payload, strlen (*payload) + 1);
}
- GST_DP_WRITE_GUINT16 (h + 58, crc);
+ GST_WRITE_UINT16_BE (h + 58, crc);
GST_LOG ("created header from event:");
gst_dp_dump_byte_array (h, GST_DP_HEADER_LENGTH);
gint64 offset;
GstSeekAccuracy accuracy;
- type = (GstSeekType) GST_DP_GUINT32 (payload);
- offset = (gint64) GST_DP_GUINT64 (payload + 4);
- accuracy = (GstSeekAccuracy) GST_DP_GUINT32 (payload + 12);
+ type = (GstSeekType) GST_READ_UINT32_BE (payload);
+ offset = (gint64) GST_READ_UINT64_BE (payload + 4);
+ accuracy = (GstSeekAccuracy) GST_READ_UINT32_BE (payload + 12);
event = gst_event_new_seek (type, offset);
GST_EVENT_TIMESTAMP (event) = GST_DP_HEADER_TIMESTAMP (header);
GST_EVENT_SEEK_ACCURACY (event) = accuracy;
gint64 offset, endoffset;
GstSeekAccuracy accuracy;
- type = (GstSeekType) GST_DP_GUINT32 (payload);
- offset = (gint64) GST_DP_GUINT64 (payload + 4);
- endoffset = (gint64) GST_DP_GUINT64 (payload + 12);
- accuracy = (GstSeekAccuracy) GST_DP_GUINT32 (payload + 20);
+ type = (GstSeekType) GST_READ_UINT32_BE (payload);
+ offset = (gint64) GST_READ_UINT64_BE (payload + 4);
+ endoffset = (gint64) GST_READ_UINT64_BE (payload + 12);
+ accuracy = (GstSeekAccuracy) GST_READ_UINT32_BE (payload + 20);
event = gst_event_new_segment_seek (type, offset, endoffset);
GST_EVENT_TIMESTAMP (event) = GST_DP_HEADER_TIMESTAMP (header);
GST_EVENT_SEEK_ACCURACY (event) = accuracy;
index 087412aab9354c30dc3b8814d2bfa4fa1eda6f71..0780a12559b22660a7d706e9411f46842207046e 100644 (file)
G_BEGIN_DECLS
-/* read the given type out of the byte buffer using glib conversion macros */
-#define GST_DP_GUINT16(x) GUINT16_FROM_BE (* (guint16 *) (x))
-#define GST_DP_GUINT32(x) GUINT32_FROM_BE (* (guint32 *) (x))
-#define GST_DP_GUINT64(x) GUINT64_FROM_BE (* (guint64 *) (x))
-
/* accessor defines */
#define GST_DP_HEADER_MAJOR_VERSION(x) ((x)[0])
#define GST_DP_HEADER_MINOR_VERSION(x) ((x)[1])
#define GST_DP_HEADER_FLAGS(x) ((x)[2])
#define GST_DP_HEADER_PAYLOAD_TYPE(x) ((x)[3])
-#define GST_DP_HEADER_PAYLOAD_LENGTH(x) GST_DP_GUINT32 (x + 4)
-#define GST_DP_HEADER_TIMESTAMP(x) GST_DP_GUINT64 (x + 8)
-#define GST_DP_HEADER_DURATION(x) GST_DP_GUINT64 (x + 16)
-#define GST_DP_HEADER_OFFSET(x) GST_DP_GUINT64 (x + 24)
-#define GST_DP_HEADER_OFFSET_END(x) GST_DP_GUINT64 (x + 32)
-#define GST_DP_HEADER_CRC_HEADER(x) GST_DP_GUINT16 (x + 56)
-#define GST_DP_HEADER_CRC_PAYLOAD(x) GST_DP_GUINT16 (x + 58)
+#define GST_DP_HEADER_PAYLOAD_LENGTH(x) GST_READ_UINT32_BE (x + 4)
+#define GST_DP_HEADER_TIMESTAMP(x) GST_READ_UINT64_BE (x + 8)
+#define GST_DP_HEADER_DURATION(x) GST_READ_UINT64_BE (x + 16)
+#define GST_DP_HEADER_OFFSET(x) GST_READ_UINT64_BE (x + 24)
+#define GST_DP_HEADER_OFFSET_END(x) GST_READ_UINT64_BE (x + 32)
+#define GST_DP_HEADER_CRC_HEADER(x) GST_READ_UINT16_BE (x + 56)
+#define GST_DP_HEADER_CRC_PAYLOAD(x) GST_READ_UINT16_BE (x + 58)
void gst_dp_init (void);
void gst_dp_dump_byte_array (guint8 *array, guint length);