sys/dvb/camutils.c: Remove the G_VALUE_HOLDS_BOXED checks. They were only added to help debug the data corruption.

Original commit message from CVS:
* sys/dvb/camutils.c:
Remove the G_VALUE_HOLDS_BOXED checks. They were
only added to help debug the data corruption.
This commit is contained in:
Zaheer Abbas Merali 2008-02-27 23:29:44 +00:00
parent 1507ada865
commit 3bba6b5f94
2 changed files with 18 additions and 17 deletions

View File

@ -1,8 +1,14 @@
2008-02-27 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* sys/dvb/camutils.c:
Remove the G_VALUE_HOLDS_BOXED checks. They were
only added to help debug the data corruption.
2008-02-27 Zaheer Abbas Merali <zaheerabbas at merali dot org> 2008-02-27 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* sys/dvb/camutils.c: * sys/dvb/camutils.c:
Don't free the program descriptors, this structure Don't free the program descriptors, this structure
containing them is stills tored after. containing them is still stored after.
Fixes data corruption. Fixes data corruption.
2008-02-27 Zaheer Abbas Merali <zaheerabbas at merali dot org> 2008-02-27 Zaheer Abbas Merali <zaheerabbas at merali dot org>

View File

@ -232,14 +232,12 @@ cam_build_ca_pmt (GstStructure * pmt, guint8 list_management, guint8 cmd_id,
streams = gst_structure_get_value (pmt, "streams"); streams = gst_structure_get_value (pmt, "streams");
value = gst_structure_get_value (pmt, "descriptors"); value = gst_structure_get_value (pmt, "descriptors");
if (value != NULL) { if (value != NULL) {
if (G_VALUE_HOLDS_BOXED (value)) { program_descriptors = g_value_get_boxed (value);
program_descriptors = g_value_get_boxed (value); /* get the length of program level CA_descriptor()s */
/* get the length of program level CA_descriptor()s */ len = get_ca_descriptors_length (program_descriptors);
len = get_ca_descriptors_length (program_descriptors); if (len > 0)
if (len > 0) /* add one byte for the program level cmd_id */
/* add one byte for the program level cmd_id */ len += 1;
len += 1;
}
} }
lengths = g_list_append (lengths, GINT_TO_POINTER (len)); lengths = g_list_append (lengths, GINT_TO_POINTER (len));
body_size += 6 + len; body_size += 6 + len;
@ -252,14 +250,12 @@ cam_build_ca_pmt (GstStructure * pmt, guint8 list_management, guint8 cmd_id,
value = gst_structure_get_value (stream, "descriptors"); value = gst_structure_get_value (stream, "descriptors");
if (value != NULL) { if (value != NULL) {
if (G_VALUE_HOLDS_BOXED (value)) { stream_descriptors = g_value_get_boxed (value);
stream_descriptors = g_value_get_boxed (value);
len = get_ca_descriptors_length (stream_descriptors); len = get_ca_descriptors_length (stream_descriptors);
if (len > 0) if (len > 0)
/* one byte for the stream level cmd_id */ /* one byte for the stream level cmd_id */
len += 1; len += 1;
}
} }
lengths = g_list_append (lengths, GINT_TO_POINTER (len)); lengths = g_list_append (lengths, GINT_TO_POINTER (len));
@ -267,7 +263,6 @@ cam_build_ca_pmt (GstStructure * pmt, guint8 list_management, guint8 cmd_id,
} }
} }
buffer = g_malloc0 (body_size); buffer = g_malloc0 (body_size);
body = buffer; body = buffer;