FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

dvb: Adapt for latest mpegts lib changes

Browse Source
This commit is contained in:
Edward Hervey 2013-08-21 08:58:52 +02:00
parent d6b55b8a66
commit c3e4fe4edc
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dvb/camutils.c
View File

@ -171,34 +171,32 @@ cam_read_length_field (guint8 * buff, guint * length)
*/ */
static guint static guint
get_ca_descriptors_length (GArray * descriptors) get_ca_descriptors_length (GPtrArray * descriptors)
{ {
guint i; guint i;
guint nb_desc = descriptors->len; guint nb_desc = descriptors->len;
guint len = 0; guint len = 0;
for (i = 0; i < nb_desc; i++) { for (i = 0; i < nb_desc; i++) {
GstMpegTsDescriptor *desc = GstMpegTsDescriptor *desc = g_ptr_array_index (descriptors, i);
&g_array_index (descriptors, GstMpegTsDescriptor, i); if (desc->tag == 0x09)
if (desc->descriptor_tag == 0x09) len += desc->length;
len += desc->descriptor_length;
} }
return len; return len;
} }
static guint8 * static guint8 *
write_ca_descriptors (guint8 * body, GArray * descriptors) write_ca_descriptors (guint8 * body, GPtrArray * descriptors)
{ {
guint i, nb_desc; guint i, nb_desc;
nb_desc = descriptors->len; nb_desc = descriptors->len;
for (i = 0; i < nb_desc; i++) { for (i = 0; i < nb_desc; i++) {
GstMpegTsDescriptor *desc = GstMpegTsDescriptor *desc = g_ptr_array_index (descriptors, i);
&g_array_index (descriptors, GstMpegTsDescriptor, i); if (desc->tag == 0x09) {
if (desc->descriptor_tag == 0x09) { memcpy (body, desc->data, desc->length);
memcpy (body, desc->descriptor_data, desc->descriptor_length); body += desc->length;
body += desc->descriptor_length;
} }
} }

4
sys/dvb/dvbbasebin.c
View File

@ -807,7 +807,7 @@ dvb_base_bin_handle_message (GstBin * bin, GstMessage * message)
static void static void
dvb_base_bin_pat_info_cb (DvbBaseBin * dvbbasebin, GstMpegTsSection * section) dvb_base_bin_pat_info_cb (DvbBaseBin * dvbbasebin, GstMpegTsSection * section)
{ {
GArray *pat; GPtrArray *pat;
DvbBaseBinProgram *program; DvbBaseBinProgram *program;
DvbBaseBinStream *stream; DvbBaseBinStream *stream;
guint old_pmt_pid; guint old_pmt_pid;
@ -820,7 +820,7 @@ dvb_base_bin_pat_info_cb (DvbBaseBin * dvbbasebin, GstMpegTsSection * section)
} }
for (i = 0; i < pat->len; i++) { for (i = 0; i < pat->len; i++) {
GstMpegTsPatProgram *patp = &g_array_index (pat, GstMpegTsPatProgram, i); GstMpegTsPatProgram *patp = g_ptr_array_index (pat, i);
program = dvb_base_bin_get_program (dvbbasebin, patp->program_number); program = dvb_base_bin_get_program (dvbbasebin, patp->program_number);
if (program == NULL) if (program == NULL)