mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

libs/gst/dataprotocol/dataprotocol.c: factor out CRC code

Browse source 
Original commit message from CVS:
* libs/gst/dataprotocol/dataprotocol.c:
(gst_dp_header_from_buffer), (gst_dp_packet_from_caps),
(gst_dp_packet_from_event):
factor out CRC code
This commit is contained in:
Thomas Vander Stichele 2006-06-02 16:46:19 +00:00
parent 53b73f3b5c
commit dbb7630f7d
2 changed files with 23 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-06-02 Thomas Vander Stichele <thomas at apestaart dot org>
* libs/gst/dataprotocol/dataprotocol.c:
(gst_dp_header_from_buffer), (gst_dp_packet_from_caps),
(gst_dp_packet_from_event):
factor out CRC code
2006-06-02 Thomas Vander Stichele <thomas at apestaart dot org> 2006-06-02 Thomas Vander Stichele <thomas at apestaart dot org>
* libs/gst/check/gstcheck.c: (gst_check_teardown_src_pad): * libs/gst/check/gstcheck.c: (gst_check_teardown_src_pad):

58
libs/gst/dataprotocol/dataprotocol.c
View file

@ -39,7 +39,6 @@ GST_DEBUG_CATEGORY (data_protocol_debug);
/* write first 6 bytes of header, as well as ABI padding */ /* write first 6 bytes of header, as well as ABI padding */
#define GST_DP_INIT_HEADER(h, maj, min, flags, type) \ #define GST_DP_INIT_HEADER(h, maj, min, flags, type) \
G_STMT_START { \ G_STMT_START { \
\
h[0] = (guint8) maj; \ h[0] = (guint8) maj; \
h[1] = (guint8) min; \ h[1] = (guint8) min; \
h[2] = (guint8) flags; \ h[2] = (guint8) flags; \
@ -50,6 +49,19 @@ G_STMT_START { \
GST_WRITE_UINT64_BE (h + 50, (guint64) 0); /* ABI padding */ \ GST_WRITE_UINT64_BE (h + 50, (guint64) 0); /* ABI padding */ \
} G_STMT_END } G_STMT_END
#define GST_DP_SET_CRC(h, flags, payload, length); \
G_STMT_START { \
guint16 crc = 0; \
if (flags & GST_DP_HEADER_FLAG_CRC_HEADER) \
/* we don't crc the last four bytes since they are crc's */ \
crc = gst_dp_crc (h, 58); \
GST_WRITE_UINT16_BE (h + 58, crc); \
\
crc = 0; \
if (length && (flags & GST_DP_HEADER_FLAG_CRC_PAYLOAD)) \
crc = gst_dp_crc (payload, length); \
GST_WRITE_UINT16_BE (h + 60, crc); \
} G_STMT_END
/* calculate a CCITT 16 bit CRC check value for a given byte array */ /* calculate a CCITT 16 bit CRC check value for a given byte array */
/* /*
@ -191,7 +203,6 @@ gst_dp_header_from_buffer (const GstBuffer * buffer, GstDPHeaderFlag flags,
guint * length, guint8 ** header) guint * length, guint8 ** header)
{ {
guint8 *h; guint8 *h;
guint16 crc;
guint16 flags_mask; guint16 flags_mask;
g_return_val_if_fail (GST_IS_BUFFER (buffer), FALSE); g_return_val_if_fail (GST_IS_BUFFER (buffer), FALSE);
@ -218,19 +229,7 @@ gst_dp_header_from_buffer (const GstBuffer * buffer, GstDPHeaderFlag flags,
GST_WRITE_UINT16_BE (h + 42, GST_BUFFER_FLAGS (buffer) & flags_mask); GST_WRITE_UINT16_BE (h + 42, GST_BUFFER_FLAGS (buffer) & flags_mask);
/* CRC */ GST_DP_SET_CRC (h, flags, GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer));
crc = 0;
if (flags & GST_DP_HEADER_FLAG_CRC_HEADER) {
/* we don't crc the last four bytes of the header since they are crc's */
crc = gst_dp_crc (h, 58);
}
GST_WRITE_UINT16_BE (h + 58, crc);
crc = 0;
if (flags & GST_DP_HEADER_FLAG_CRC_PAYLOAD) {
crc = gst_dp_crc (GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer));
}
GST_WRITE_UINT16_BE (h + 60, crc);
GST_LOG ("created header from buffer:"); GST_LOG ("created header from buffer:");
gst_dp_dump_byte_array (h, GST_DP_HEADER_LENGTH); gst_dp_dump_byte_array (h, GST_DP_HEADER_LENGTH);
@ -255,7 +254,6 @@ gst_dp_packet_from_caps (const GstCaps * caps, GstDPHeaderFlag flags,
guint * length, guint8 ** header, guint8 ** payload) guint * length, guint8 ** header, guint8 ** payload)
{ {
guint8 *h; guint8 *h;
guint16 crc;
guchar *string; guchar *string;
/* FIXME: GST_IS_CAPS doesn't work /* FIXME: GST_IS_CAPS doesn't work
@ -280,18 +278,7 @@ gst_dp_packet_from_caps (const GstCaps * caps, GstDPHeaderFlag flags,
GST_WRITE_UINT64_BE (h + 26, (guint64) 0); GST_WRITE_UINT64_BE (h + 26, (guint64) 0);
GST_WRITE_UINT64_BE (h + 34, (guint64) 0); GST_WRITE_UINT64_BE (h + 34, (guint64) 0);
/* CRC */ GST_DP_SET_CRC (h, flags, string, strlen ((gchar *) string) + 1);
crc = 0;
if (flags & GST_DP_HEADER_FLAG_CRC_HEADER) {
crc = gst_dp_crc (h, 58);
}
GST_WRITE_UINT16_BE (h + 58, crc);
crc = 0;
if (flags & GST_DP_HEADER_FLAG_CRC_PAYLOAD) {
crc = gst_dp_crc (string, strlen ((gchar *) string) + 1);
}
GST_WRITE_UINT16_BE (h + 60, crc);
GST_LOG ("created header from caps:"); GST_LOG ("created header from caps:");
gst_dp_dump_byte_array (h, GST_DP_HEADER_LENGTH); gst_dp_dump_byte_array (h, GST_DP_HEADER_LENGTH);
@ -317,7 +304,6 @@ gst_dp_packet_from_event (const GstEvent * event, GstDPHeaderFlag flags,
guint * length, guint8 ** header, guint8 ** payload) guint * length, guint8 ** header, guint8 ** payload)
{ {
guint8 *h; guint8 *h;
guint16 crc;
guint pl_length; /* length of payload */ guint pl_length; /* length of payload */
g_return_val_if_fail (event, FALSE); g_return_val_if_fail (event, FALSE);
@ -387,19 +373,7 @@ gst_dp_packet_from_event (const GstEvent * event, GstDPHeaderFlag flags,
/* timestamp */ /* timestamp */
GST_WRITE_UINT64_BE (h + 10, GST_EVENT_TIMESTAMP (event)); GST_WRITE_UINT64_BE (h + 10, GST_EVENT_TIMESTAMP (event));
/* CRC */ GST_DP_SET_CRC (h, flags, *payload, pl_length);
crc = 0;
if (flags & GST_DP_HEADER_FLAG_CRC_HEADER) {
crc = gst_dp_crc (h, 58);
}
GST_WRITE_UINT16_BE (h + 58, crc);
crc = 0;
/* events can have a NULL payload */
if (*payload && flags & GST_DP_HEADER_FLAG_CRC_PAYLOAD) {
crc = gst_dp_crc (*payload, strlen ((gchar *) * payload) + 1);
}
GST_WRITE_UINT16_BE (h + 60, crc);
GST_LOG ("created header from event:"); GST_LOG ("created header from event:");
gst_dp_dump_byte_array (h, GST_DP_HEADER_LENGTH); gst_dp_dump_byte_array (h, GST_DP_HEADER_LENGTH);