From 6a5f1354b34a62adfdf78a1d8963adb2d59f7b9b Mon Sep 17 00:00:00 2001 From: Jesper Larsen Date: Tue, 19 Nov 2013 12:21:31 +0100 Subject: [PATCH] mpegtsmux: Use mpeg-ts lib for PAT/PMT sections Rewrite of the PAT/PMT section handling to use the mpeg-ts library --- gst/mpegtsmux/tsmux/Makefile.am | 2 +- gst/mpegtsmux/tsmux/crc.h | 58 --------- gst/mpegtsmux/tsmux/tsmux.c | 255 +++++++++----------------------------- gst/mpegtsmux/tsmux/tsmuxstream.c | 87 ++++++------- gst/mpegtsmux/tsmux/tsmuxstream.h | 2 +- 5 files changed, 101 insertions(+), 303 deletions(-) delete mode 100644 gst/mpegtsmux/tsmux/crc.h diff --git a/gst/mpegtsmux/tsmux/Makefile.am b/gst/mpegtsmux/tsmux/Makefile.am index 29e52a0..6c7ab06 100644 --- a/gst/mpegtsmux/tsmux/Makefile.am +++ b/gst/mpegtsmux/tsmux/Makefile.am @@ -6,4 +6,4 @@ libtsmux_la_LIBADD = $(GST_LIBS) \ libtsmux_la_LDFLAGS = -module -avoid-version libtsmux_la_SOURCES = tsmux.c tsmuxstream.c -noinst_HEADERS = crc.h tsmuxcommon.h tsmux.h tsmuxstream.h +noinst_HEADERS = tsmuxcommon.h tsmux.h tsmuxstream.h diff --git a/gst/mpegtsmux/tsmux/crc.h b/gst/mpegtsmux/tsmux/crc.h deleted file mode 100644 index 06f94b4..0000000 --- a/gst/mpegtsmux/tsmux/crc.h +++ /dev/null @@ -1,58 +0,0 @@ -static guint32 crc_tab[256] = { - 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, - 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, - 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7, - 0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75, - 0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, - 0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, - 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef, - 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d, - 0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb, - 0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, - 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0, - 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072, - 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4, - 0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, - 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, - 0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba, - 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc, - 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, - 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050, - 0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, - 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34, - 0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, - 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1, - 0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53, - 0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, - 0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, - 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9, - 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b, - 0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, - 0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, - 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71, - 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3, - 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2, - 0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, - 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, - 0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec, - 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a, - 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, - 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676, - 0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, - 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662, - 0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, - 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4 -}; - -static guint32 -calc_crc32 (guint8 * data, guint datalen) -{ - guint i; - guint32 crc = 0xffffffff; - - for (i = 0; i < datalen; i++) { - crc = (crc << 8) ^ crc_tab[((crc >> 24) ^ *data++) & 0xff]; - } - - return crc; -} diff --git a/gst/mpegtsmux/tsmux/tsmux.c b/gst/mpegtsmux/tsmux/tsmux.c index e9b88dd..f4b74c9 100644 --- a/gst/mpegtsmux/tsmux/tsmux.c +++ b/gst/mpegtsmux/tsmux/tsmux.c @@ -87,7 +87,6 @@ #include "tsmux.h" #include "tsmuxstream.h" -#include "crc.h" #define GST_CAT_DEFAULT mpegtsmux_debug @@ -120,6 +119,7 @@ static void tsmux_section_free (TsMuxSection * section) { gst_mpegts_section_unref (section->section); + g_slice_free (TsMuxSection, section); } /** @@ -308,6 +308,10 @@ tsmux_free (TsMux * mux) g_return_if_fail (mux != NULL); + /* Free PAT section */ + if (mux->pat.section) + gst_mpegts_section_unref (mux->pat.section); + /* Free all programs */ for (cur = mux->programs; cur; cur = cur->next) { TsMuxProgram *program = (TsMuxProgram *) cur->data; @@ -846,7 +850,7 @@ tsmux_section_write_packet (GstMpegTsSectionType * type, GstMemory *mem; guint8 *packet; guint8 *data; - gsize data_size; + gsize data_size = 0; gsize payload_written; guint len = 0, offset = 0, payload_len = 0; @@ -867,7 +871,10 @@ tsmux_section_write_packet (GstMpegTsSectionType * type, section->pi.stream_avail = data_size; payload_written = 0; - section_buffer = gst_buffer_new_wrapped (data, data_size); + /* Wrap section data in a buffer without free function. + The data will be freed when the GstMpegTsSection is destroyed. */ + section_buffer = gst_buffer_new_wrapped_full (GST_MEMORY_FLAG_READONLY, + data, data_size, 0, data_size, NULL, NULL); TS_DEBUG ("Section buffer with size %" G_GSIZE_FORMAT " created", gst_buffer_get_size (section_buffer)); @@ -922,6 +929,8 @@ tsmux_section_write_packet (GstMpegTsSectionType * type, section->pi.packet_start_unit_indicator = FALSE; } + gst_buffer_unref (section_buffer); + return TRUE; fail: @@ -1103,129 +1112,20 @@ tsmux_program_free (TsMuxProgram * program) { g_return_if_fail (program != NULL); + /* Free PMT section */ + if (program->pmt.section) + gst_mpegts_section_unref (program->pmt.section); + g_array_free (program->streams, TRUE); g_slice_free (TsMuxProgram, program); } static gboolean -tsmux_write_section (TsMux * mux, TsMuxSection * section) -{ - guint8 *cur_in; - guint payload_remain; - guint payload_len, payload_offs; - TsMuxPacketInfo *pi; - GstBuffer *buf = NULL; - GstMapInfo map; - - pi = §ion->pi; - - pi->packet_start_unit_indicator = TRUE; - - cur_in = section->data; - payload_remain = pi->stream_avail; - - while (payload_remain > 0) { - - /* obtain buffer */ - map.data = NULL; - if (!tsmux_get_buffer (mux, &buf)) - goto fail; - - gst_buffer_map (buf, &map, GST_MAP_WRITE); - - if (pi->packet_start_unit_indicator) { - /* Need to write an extra single byte start pointer */ - pi->stream_avail++; - - if (!tsmux_write_ts_header (map.data, pi, &payload_len, &payload_offs)) { - pi->stream_avail--; - goto fail; - } - pi->stream_avail--; - - /* Write the pointer byte */ - map.data[payload_offs] = 0x00; - - payload_offs++; - payload_len--; - pi->packet_start_unit_indicator = FALSE; - } else { - if (!tsmux_write_ts_header (map.data, pi, &payload_len, &payload_offs)) - goto fail; - } - - TS_DEBUG ("Outputting %d bytes to section. %d remaining after", - payload_len, payload_remain - payload_len); - - memcpy (map.data + payload_offs, cur_in, payload_len); - - cur_in += payload_len; - payload_remain -= payload_len; - - gst_buffer_unmap (buf, &map); - - /* we do not write PCR in section */ - if (G_UNLIKELY (!tsmux_packet_out (mux, buf, -1))) { - /* buffer given away */ - buf = NULL; - goto fail; - } - buf = NULL; - } - - return TRUE; - - /* ERRORS */ -fail: - { - if (map.data && buf) - gst_buffer_unmap (buf, &map); - if (buf) - gst_buffer_unref (buf); - return FALSE; - } -} - -static void -tsmux_write_section_hdr (guint8 * pos, guint8 table_id, guint16 len, - guint16 id, guint8 version, guint8 section_nr, guint8 last_section_nr) -{ - /* The length passed is the total length of the section, but we're not - * supposed to include the first 3 bytes of the header in the count */ - len -= 3; - - /* 1 byte table identifier */ - *pos++ = table_id; - /* section_syntax_indicator = '0' | '0' | '11' reserved bits | (len >> 8) */ - tsmux_put16 (&pos, 0xB000 | len); - /* 2 bytes transport/program id */ - tsmux_put16 (&pos, id); - - /* '11' reserved | version 'xxxxxx' | 'x' current_next */ - *pos++ = 0xC0 | ((version & 0x1F) << 1) | 0x01; - *pos++ = section_nr; - *pos++ = last_section_nr; -} - -static gboolean tsmux_write_pat (TsMux * mux) { - GList *cur; - TsMuxSection *pat = &mux->pat; if (mux->pat_changed) { /* program_association_section () - * table_id 8 uimsbf - * section_syntax_indicator 1 bslbf - * '0' 1 bslbf - * reserved 2 bslbf - * section_length 12 uimsbf - * transport_stream_id 16 uimsbf - * reserved 2 bslbf - * version_number 5 uimsbf - * current_next_indicator 1 bslbf - * section_number 8 uimsbf - * last_section_number 8 uimsbf * for (i = 0; i < N; i++) { * program_number 16 uimsbf * reserved 3 bslbf @@ -1233,58 +1133,43 @@ tsmux_write_pat (TsMux * mux) * } * CRC_32 32 rbchof */ - guint8 *pos; - guint32 crc; + GList *cur; + GPtrArray *pat; - /* Prepare the section data after the section header */ - pos = pat->data + TSMUX_SECTION_HDR_SIZE; + pat = gst_mpegts_pat_new (); for (cur = mux->programs; cur; cur = cur->next) { + GstMpegTsPatProgram *pat_pgm; TsMuxProgram *program = (TsMuxProgram *) cur->data; - tsmux_put16 (&pos, program->pgm_number); - tsmux_put16 (&pos, 0xE000 | program->pmt_pid); + pat_pgm = gst_mpegts_pat_program_new (); + pat_pgm->program_number = program->pgm_number; + pat_pgm->network_or_program_map_PID = program->pmt_pid; + + g_ptr_array_add (pat, pat_pgm); } - /* Measure the section length, include extra 4 bytes for CRC below */ - pat->pi.stream_avail = pos - pat->data + 4; + if (mux->pat.section) + gst_mpegts_section_unref (mux->pat.section); - /* Go back and write the header now that we know the final length. - * table_id = 0 for PAT */ - tsmux_write_section_hdr (pat->data, 0x00, pat->pi.stream_avail, - mux->transport_id, mux->pat_version, 0, 0); + mux->pat.section = gst_mpegts_section_from_pat (pat, mux->transport_id); - /* Calc and output CRC for data bytes, not including itself */ - crc = calc_crc32 (pat->data, pat->pi.stream_avail - 4); - tsmux_put32 (&pos, crc); + mux->pat.section->version_number = mux->pat_version++; - TS_DEBUG ("PAT has %d programs, is %u bytes", - mux->nb_programs, pat->pi.stream_avail); + TS_DEBUG ("PAT has %d programs", mux->nb_programs); mux->pat_changed = FALSE; - mux->pat_version++; } - return tsmux_write_section (mux, pat); + return tsmux_section_write_packet (GINT_TO_POINTER (GST_MPEGTS_SECTION_PAT), + &mux->pat, mux); } static gboolean tsmux_write_pmt (TsMux * mux, TsMuxProgram * program) { - TsMuxSection *pmt = &program->pmt; if (program->pmt_changed) { /* program_association_section () - * table_id 8 uimsbf - * section_syntax_indicator 1 bslbf - * '0' 1 bslbf - * reserved 2 bslbf - * section_length 12 uimsbf - * program_id 16 uimsbf - * reserved 2 bslbf - * version_number 5 uimsbf - * current_next_indicator 1 bslbf - * section_number 8 uimsbf - * last_section_number 8 uimsbf * reserved 3 bslbf * PCR_PID 13 uimsbf * reserved 4 bslbf @@ -1302,74 +1187,56 @@ tsmux_write_pmt (TsMux * mux, TsMuxProgram * program) * descriptor (); * } * } - * CRC_32 32 rbchof */ - guint8 *pos; - guint32 crc; + GstMpegTsDescriptor *descriptor; + GstMpegTsPMT *pmt; + guint8 desc[] = { 0x0F, 0xFF, 0xFC, 0xFC }; guint i; - /* Prepare the section data after the basic section header */ - pos = pmt->data + TSMUX_SECTION_HDR_SIZE; + pmt = gst_mpegts_pmt_new (); if (program->pcr_stream == NULL) - tsmux_put16 (&pos, 0xFFFF); + pmt->pcr_pid = 0x1FFF; else - tsmux_put16 (&pos, 0xE000 | tsmux_stream_get_pid (program->pcr_stream)); + pmt->pcr_pid = tsmux_stream_get_pid (program->pcr_stream); - /* 4 bits reserved, 12 bits program_info_length, descriptor : HDMV */ - tsmux_put16 (&pos, 0xF00C); - tsmux_put16 (&pos, 0x0504); - tsmux_put16 (&pos, 0x4844); - tsmux_put16 (&pos, 0x4D56); - tsmux_put16 (&pos, 0x8804); - tsmux_put16 (&pos, 0x0FFF); - tsmux_put16 (&pos, 0xFCFC); + descriptor = gst_mpegts_descriptor_from_registration ("HDMV", NULL, 0); + g_ptr_array_add (pmt->descriptors, descriptor); + + descriptor = gst_mpegts_descriptor_from_custom (0x88, desc, 4); + g_ptr_array_add (pmt->descriptors, descriptor); /* Write out the entries */ for (i = 0; i < program->streams->len; i++) { + GstMpegTsPMTStream *pmt_stream; TsMuxStream *stream = g_array_index (program->streams, TsMuxStream *, i); - guint16 es_info_len; + + pmt_stream = gst_mpegts_pmt_stream_new (); /* FIXME: Use API to retrieve this from the stream */ - *pos++ = stream->stream_type; - tsmux_put16 (&pos, 0xE000 | tsmux_stream_get_pid (stream)); + pmt_stream->stream_type = stream->stream_type; + pmt_stream->pid = tsmux_stream_get_pid (stream); /* Write any ES descriptors needed */ - tsmux_stream_get_es_descrs (stream, mux->es_info_buf, &es_info_len); - tsmux_put16 (&pos, 0xF000 | es_info_len); - - if (es_info_len > 0) { - TS_DEBUG ("Writing descriptor of len %d for PID 0x%04x", - es_info_len, tsmux_stream_get_pid (stream)); - if (G_UNLIKELY (pos + es_info_len >= - pmt->data + TSMUX_MAX_SECTION_LENGTH)) - return FALSE; - - memcpy (pos, mux->es_info_buf, es_info_len); - pos += es_info_len; - } + tsmux_stream_get_es_descrs (stream, pmt_stream); + g_ptr_array_add (pmt->streams, pmt_stream); } - /* Include the CRC in the byte count */ - pmt->pi.stream_avail = pos - pmt->data + 4; + TS_DEBUG ("PMT for program %d has %d streams", + program->pgm_number, program->streams->len); - /* Go back and patch the pmt_header now that we know the length. - * table_id = 2 for PMT */ - tsmux_write_section_hdr (pmt->data, 0x02, pmt->pi.stream_avail, - program->pgm_number, program->pmt_version, 0, 0); + pmt->program_number = program->pgm_number; - /* Calc and output CRC for data bytes, - * but not counting the CRC bytes this time */ - crc = calc_crc32 (pmt->data, pmt->pi.stream_avail - 4); - tsmux_put32 (&pos, crc); + program->pmt.pi.pid = program->pmt_pid; + program->pmt_changed = FALSE; - TS_DEBUG ("PMT for program %d has %d streams, is %u bytes", - program->pgm_number, program->streams->len, pmt->pi.stream_avail); + if (program->pmt.section) + gst_mpegts_section_unref (program->pmt.section); - pmt->pi.pid = program->pmt_pid; - program->pmt_changed = FALSE; - program->pmt_version++; + program->pmt.section = gst_mpegts_section_from_pmt (pmt, program->pmt_pid); + program->pmt.section->version_number = program->pmt_version++; } - return tsmux_write_section (mux, pmt); + return tsmux_section_write_packet (GINT_TO_POINTER (GST_MPEGTS_SECTION_PMT), + &program->pmt, mux); } diff --git a/gst/mpegtsmux/tsmux/tsmuxstream.c b/gst/mpegtsmux/tsmux/tsmuxstream.c index a03977a..7a4605e 100644 --- a/gst/mpegtsmux/tsmux/tsmuxstream.c +++ b/gst/mpegtsmux/tsmux/tsmuxstream.c @@ -83,6 +83,8 @@ #include +#include + #include "tsmuxcommon.h" #include "tsmuxstream.h" @@ -694,22 +696,16 @@ tsmux_stream_add_data (TsMuxStream * stream, guint8 * data, guint len, * @buf and @len must be at least #TSMUX_MIN_ES_DESC_LEN. */ void -tsmux_stream_get_es_descrs (TsMuxStream * stream, guint8 * buf, guint16 * len) +tsmux_stream_get_es_descrs (TsMuxStream * stream, + GstMpegTsPMTStream * pmt_stream) { - guint8 *pos; + GstMpegTsDescriptor *descriptor; g_return_if_fail (stream != NULL); - - if (buf == NULL) { - if (len != NULL) - *len = 0; - return; - } + g_return_if_fail (pmt_stream != NULL); /* Based on the stream type, write out any descriptors to go in the * PMT ES_info field */ - pos = buf; - /* tag (registration_descriptor), length, format_identifier */ switch (stream->stream_type) { case TSMUX_ST_AUDIO_AAC: @@ -719,34 +715,26 @@ tsmux_stream_get_es_descrs (TsMuxStream * stream, guint8 * buf, guint16 * len) /* FIXME */ break; case TSMUX_ST_VIDEO_H264: - *pos++ = 0x05; - *pos++ = 8; - *pos++ = 0x48; /* 'H' */ - *pos++ = 0x44; /* 'D' */ - *pos++ = 0x4D; /* 'M' */ - *pos++ = 0x56; /* 'V' */ + { /* FIXME : Not sure about this additional_identification_info */ - *pos++ = 0xFF; - *pos++ = 0x1B; - *pos++ = 0x44; - *pos++ = 0x3F; + guint8 add_info[] = { 0xFF, 0x1B, 0x44, 0x3F }; + + descriptor = gst_mpegts_descriptor_from_registration ("HDMV", + add_info, 4); + + g_ptr_array_add (pmt_stream->descriptors, descriptor); break; + } case TSMUX_ST_VIDEO_DIRAC: - *pos++ = 0x05; - *pos++ = 4; - *pos++ = 0x64; /* 'd' */ - *pos++ = 0x72; /* 'r' */ - *pos++ = 0x61; /* 'a' */ - *pos++ = 0x63; /* 'c' */ + descriptor = gst_mpegts_descriptor_from_registration ("drac", NULL, 0); + g_ptr_array_add (pmt_stream->descriptors, descriptor); break; case TSMUX_ST_PS_AUDIO_AC3: { - *pos++ = 0x05; - *pos++ = 4; - *pos++ = 0x41; /* 'A' */ - *pos++ = 0x43; /* 'C' */ - *pos++ = 0x2D; /* '-' */ - *pos++ = 0x33; /* '3' */ + guint8 add_info[6]; + guint8 *pos; + + pos = add_info; /* audio_stream_descriptor () | ATSC A/52-2001 Annex A * @@ -870,6 +858,11 @@ tsmux_stream_get_es_descrs (TsMuxStream * stream, guint8 * buf, guint16 * len) *pos++ = 0x00; + descriptor = gst_mpegts_descriptor_from_registration ("AC-3", + add_info, 6); + + g_ptr_array_add (pmt_stream->descriptors, descriptor); + break; } case TSMUX_ST_PS_AUDIO_DTS: @@ -879,11 +872,12 @@ tsmux_stream_get_es_descrs (TsMuxStream * stream, guint8 * buf, guint16 * len) /* FIXME */ break; case TSMUX_ST_PS_TELETEXT: - /* tag */ - *pos++ = 0x56; /* FIXME empty descriptor for now; * should be provided by upstream in event or so ? */ - *pos = 0; + descriptor = + gst_mpegts_descriptor_from_custom (GST_MTS_DESC_DVB_TELETEXT, 0, 1); + + g_ptr_array_add (pmt_stream->descriptors, descriptor); break; case TSMUX_ST_PS_DVB_SUBPICTURE: /* falltrough ... @@ -892,25 +886,20 @@ tsmux_stream_get_es_descrs (TsMuxStream * stream, guint8 * buf, guint16 * len) case TSMUX_ST_PRIVATE_DATA: if (stream->is_dvb_sub) { GST_DEBUG ("Stream language %s", stream->language); - *pos++ = 0x59; /* dvb subtitles */ - *pos++ = 0x08; /* descriptor length */ - *pos++ = stream->language[0]; /* Language */ - *pos++ = stream->language[1]; - *pos++ = stream->language[2]; - *pos++ = 0x10; /* Simple DVB subtitles with no monitor aspect ratio critical - FIXME, how do we make it settable? */ - *pos++ = 0x00; /* Default composition page ID */ - *pos++ = 0x01; - *pos++ = 0x01; /* Default ancillary_page_id */ - *pos++ = 0x52; + /* Simple DVB subtitles with no monitor aspect ratio critical + FIXME, how do we make it settable? */ + /* Default composition page ID */ + /* Default ancillary_page_id */ + descriptor = + gst_mpegts_descriptor_from_dvb_subtitling (stream->language, 0x10, + 0x0001, 0x0152); + + g_ptr_array_add (pmt_stream->descriptors, descriptor); break; } default: break; } - - if (len) - *len = (pos - buf); } /** diff --git a/gst/mpegtsmux/tsmux/tsmuxstream.h b/gst/mpegtsmux/tsmux/tsmuxstream.h index 8bff394..33d5eaf 100644 --- a/gst/mpegtsmux/tsmux/tsmuxstream.h +++ b/gst/mpegtsmux/tsmux/tsmuxstream.h @@ -228,7 +228,7 @@ void tsmux_stream_pcr_unref (TsMuxStream *stream); gboolean tsmux_stream_is_pcr (TsMuxStream *stream); gboolean tsmux_stream_at_pes_start (TsMuxStream *stream); -void tsmux_stream_get_es_descrs (TsMuxStream *stream, guint8 *buf, guint16 *len); +void tsmux_stream_get_es_descrs (TsMuxStream *stream, GstMpegTsPMTStream *pmt_stream); gint tsmux_stream_bytes_in_buffer (TsMuxStream *stream); gint tsmux_stream_bytes_avail (TsMuxStream *stream); -- 2.7.4