mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/mpegaudioparse/gstxingmux.c: Fix alignment issues that caused SIGBUS on some architectures.

Browse source 
Original commit message from CVS:
* gst/mpegaudioparse/gstxingmux.c: (generate_xing_header):
Fix alignment issues that caused SIGBUS on some architectures.
This commit is contained in:
Sebastian Dröge 2008-05-26 07:41:24 +00:00
parent 3f6175dfdc
commit 916a018b60
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2008-05-26 Sebastian Dröge <slomo@circular-chaos.org>
* gst/mpegaudioparse/gstxingmux.c: (generate_xing_header):
Fix alignment issues that caused SIGBUS on some architectures.
2008-05-25 Tim-Philipp Müller <tim.muller at collabora co uk> 2008-05-25 Tim-Philipp Müller <tim.muller at collabora co uk>
* gst/ac3parse/gstac3parse.c: (gst_ac3parse_chain): * gst/ac3parse/gstac3parse.c: (gst_ac3parse_chain):

26
gst/mpegaudioparse/gstxingmux.c
View file

@ -256,6 +256,7 @@ static GstBuffer *
generate_xing_header (GstXingMux * xing) generate_xing_header (GstXingMux * xing)
{ {
guint32 *xing_flags; guint32 *xing_flags;
guint32 xing_flags_tmp = 0;
GstBuffer *xing_header; GstBuffer *xing_header;
guchar *data; guchar *data;
@ -326,7 +327,7 @@ generate_xing_header (GstXingMux * xing)
GST_DEBUG ("Setting number of frames to %u", number_of_frames); GST_DEBUG ("Setting number of frames to %u", number_of_frames);
number_of_frames = GUINT32_TO_BE (number_of_frames); number_of_frames = GUINT32_TO_BE (number_of_frames);
memcpy (data, &number_of_frames, 4); memcpy (data, &number_of_frames, 4);
*xing_flags |= GST_XING_FRAME_FIELD; xing_flags_tmp |= GST_XING_FRAME_FIELD;
data += 4; data += 4;
} }
@ -352,7 +353,7 @@ generate_xing_header (GstXingMux * xing)
GST_DEBUG ("Setting number of bytes to %u", nbytes); GST_DEBUG ("Setting number of bytes to %u", nbytes);
nbytes = GUINT32_TO_BE (nbytes); nbytes = GUINT32_TO_BE (nbytes);
memcpy (data, &nbytes, 4); memcpy (data, &nbytes, 4);
*xing_flags |= GST_XING_BYTES_FIELD; xing_flags_tmp |= GST_XING_BYTES_FIELD;
data += 4; data += 4;
} }
} }
@ -362,36 +363,41 @@ generate_xing_header (GstXingMux * xing)
GList *it; GList *it;
gint percent = 0; gint percent = 0;
*xing_flags |= GST_XING_TOC_FIELD; xing_flags_tmp |= GST_XING_TOC_FIELD;
GST_DEBUG ("Writing seek table"); GST_DEBUG ("Writing seek table");
for (it = xing->seek_table; it != NULL && percent < 100; it = it->next) { for (it = xing->seek_table; it != NULL && percent < 100; it = it->next) {
GstXingSeekEntry *entry = (GstXingSeekEntry *) it->data; GstXingSeekEntry *entry = (GstXingSeekEntry *) it->data;
gint64 byte; gint64 pos;
guchar byte;
while ((entry->timestamp * 100) / duration >= percent) { while ((entry->timestamp * 100) / duration >= percent) {
byte = (entry->byte * 256) / byte_count; pos = (entry->byte * 256) / byte_count;
GST_DEBUG (" %d %% -- %" G_GINT64_FORMAT " 1/256", percent, byte); GST_DEBUG (" %d %% -- %" G_GINT64_FORMAT " 1/256", percent, pos);
*data = byte; byte = (guchar) pos;
memcpy (data, &byte, 1);
data++; data++;
percent++; percent++;
} }
} }
if (percent < 100) { if (percent < 100) {
guchar b = *(data - 1); guchar b;
gint i; gint i;
memcpy (&b, data - 1, 1);
for (i = percent; i < 100; i++) { for (i = percent; i < 100; i++) {
GST_DEBUG (" %d %% -- %d 1/256", i, b); GST_DEBUG (" %d %% -- %d 1/256", i, b);
*data = b; memcpy (data, &b, 1);
data++; data++;
} }
} }
} }
GST_DEBUG ("Setting Xing flags to 0x%x\n", *xing_flags); GST_DEBUG ("Setting Xing flags to 0x%x\n", *xing_flags);
*xing_flags = GUINT32_TO_BE (*xing_flags); xing_flags_tmp = GUINT32_TO_BE (xing_flags_tmp);
memcpy (xing_flags, &xing_flags_tmp, 4);
return xing_header; return xing_header;
} }