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

mpegtsbase: Use a bit array instead of an array of gboolean

Browse source 
Makes know_psi and is_pes 32 times smaller
This commit is contained in:
Edward Hervey 2011-07-19 08:45:51 +02:00
parent beea027d19
commit dc18e2b16d
3 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst/mpegtsdemux/mpegtsbase.c
View file

@ -192,11 +192,11 @@ mpegts_base_reset (MpegTSBase * base)
MpegTSBaseClass *klass = GST_MPEGTS_BASE_GET_CLASS (base); MpegTSBaseClass *klass = GST_MPEGTS_BASE_GET_CLASS (base);
mpegts_packetizer_clear (base->packetizer); mpegts_packetizer_clear (base->packetizer);
memset (base->is_pes, 0, 8192); memset (base->is_pes, 0, 1024);
memset (base->known_psi, 0, 8192); memset (base->known_psi, 0, 1024);
/* PAT */ /* PAT */
base->known_psi[0] = TRUE; MPEGTS_BIT_SET (base->known_psi, 0);
/* FIXME : Commenting the Following lines is to be in sync with the following /* FIXME : Commenting the Following lines is to be in sync with the following
* commit * commit
@ -234,8 +234,8 @@ mpegts_base_init (MpegTSBase * base, MpegTSBaseClass * klass)
base->programs = g_hash_table_new_full (g_direct_hash, g_direct_equal, base->programs = g_hash_table_new_full (g_direct_hash, g_direct_equal,
NULL, (GDestroyNotify) mpegts_base_free_program); NULL, (GDestroyNotify) mpegts_base_free_program);
base->is_pes = g_new0 (gboolean, 8192); base->is_pes = g_new0 (guint8, 1024);
base->known_psi = g_new0 (gboolean, 8192); base->known_psi = g_new0 (guint8, 1024);
mpegts_base_reset (base); mpegts_base_reset (base);
base->program_size = sizeof (MpegTSBaseProgram); base->program_size = sizeof (MpegTSBaseProgram);
base->stream_size = sizeof (MpegTSBaseStream); base->stream_size = sizeof (MpegTSBaseStream);
@ -533,11 +533,11 @@ mpegts_base_deactivate_pmt (MpegTSBase * base, MpegTSBaseProgram * program)
gst_structure_id_get (stream, QUARK_PID, G_TYPE_UINT, &pid, gst_structure_id_get (stream, QUARK_PID, G_TYPE_UINT, &pid,
QUARK_STREAM_TYPE, G_TYPE_UINT, &stream_type, NULL); QUARK_STREAM_TYPE, G_TYPE_UINT, &stream_type, NULL);
mpegts_base_program_remove_stream (base, program, (guint16) pid); mpegts_base_program_remove_stream (base, program, (guint16) pid);
base->is_pes[pid] = FALSE; MPEGTS_BIT_UNSET (base->is_pes, pid);
} }
/* remove pcr stream */ /* remove pcr stream */
mpegts_base_program_remove_stream (base, program, program->pcr_pid); mpegts_base_program_remove_stream (base, program, program->pcr_pid);
base->is_pes[program->pcr_pid] = FALSE; MPEGTS_BIT_UNSET (base->is_pes, program->pcr_pid);
} }
} }
@ -556,11 +556,11 @@ mpegts_base_is_psi (MpegTSBase * base, MpegTSPacketizerPacket * packet)
0x72, 0x73, 0x7E, 0x7F, TABLE_ID_UNSET 0x72, 0x73, 0x7E, 0x7F, TABLE_ID_UNSET
}; };
if (base->known_psi[packet->pid]) if (MPEGTS_BIT_IS_SET (base->known_psi, packet->pid))
retval = TRUE; retval = TRUE;
/* check is it is a pes pid */ /* check is it is a pes pid */
if (base->is_pes[packet->pid]) if (MPEGTS_BIT_IS_SET (base->is_pes, packet->pid))
return FALSE; return FALSE;
if (!retval) { if (!retval) {
@ -637,14 +637,14 @@ mpegts_base_apply_pat (MpegTSBase * base, GstStructure * pat_info)
/* FIXME: when this happens it may still be pmt pid of another /* FIXME: when this happens it may still be pmt pid of another
* program, so setting to False may make it go through expensive * program, so setting to False may make it go through expensive
* path in is_psi unnecessarily */ * path in is_psi unnecessarily */
base->known_psi[program->pmt_pid] = FALSE; MPEGTS_BIT_UNSET (base->known_psi, program->pmt_pid);
} }
program->pmt_pid = pid; program->pmt_pid = pid;
base->known_psi[pid] = TRUE; MPEGTS_BIT_SET (base->known_psi, pid);
} }
} else { } else {
base->known_psi[pid] = TRUE; MPEGTS_BIT_SET (base->known_psi, pid);
program = mpegts_base_add_program (base, program_number, pid); program = mpegts_base_add_program (base, program_number, pid);
} }
program->patcount += 1; program->patcount += 1;
@ -684,7 +684,7 @@ mpegts_base_apply_pat (MpegTSBase * base, GstStructure * pat_info)
/* FIXME: when this happens it may still be pmt pid of another /* FIXME: when this happens it may still be pmt pid of another
* program, so setting to False may make it go through expensive * program, so setting to False may make it go through expensive
* path in is_psi unnecessarily */ * path in is_psi unnecessarily */
base->known_psi[pid] = TRUE; MPEGTS_BIT_SET (base->known_psi, pid);
mpegts_packetizer_remove_stream (base->packetizer, pid); mpegts_packetizer_remove_stream (base->packetizer, pid);
} }
@ -731,7 +731,7 @@ mpegts_base_apply_pmt (MpegTSBase * base,
program->pmt_info = NULL; program->pmt_info = NULL;
} else { } else {
/* no PAT?? */ /* no PAT?? */
base->known_psi[pmt_pid] = TRUE; MPEGTS_BIT_SET (base->known_psi, pmt_pid);
program = mpegts_base_add_program (base, program_number, pid); program = mpegts_base_add_program (base, program_number, pid);
} }
@ -740,7 +740,7 @@ mpegts_base_apply_pmt (MpegTSBase * base,
program->pmt_pid = pmt_pid; program->pmt_pid = pmt_pid;
program->pcr_pid = pcr_pid; program->pcr_pid = pcr_pid;
mpegts_base_program_add_stream (base, program, (guint16) pcr_pid, -1, NULL); mpegts_base_program_add_stream (base, program, (guint16) pcr_pid, -1, NULL);
base->is_pes[pcr_pid] = TRUE; MPEGTS_BIT_SET (base->is_pes, pcr_pid);
for (i = 0; i < gst_value_list_get_size (new_streams); ++i) { for (i = 0; i < gst_value_list_get_size (new_streams); ++i) {
value = gst_value_list_get_value (new_streams, i); value = gst_value_list_get_value (new_streams, i);
@ -748,7 +748,7 @@ mpegts_base_apply_pmt (MpegTSBase * base,
gst_structure_id_get (stream, QUARK_PID, G_TYPE_UINT, &pid, gst_structure_id_get (stream, QUARK_PID, G_TYPE_UINT, &pid,
QUARK_STREAM_TYPE, G_TYPE_UINT, &stream_type, NULL); QUARK_STREAM_TYPE, G_TYPE_UINT, &stream_type, NULL);
base->is_pes[pid] = TRUE; MPEGTS_BIT_SET (base->is_pes, pid);
mpegts_base_program_add_stream (base, program, mpegts_base_program_add_stream (base, program,
(guint16) pid, (guint8) stream_type, stream); (guint16) pid, (guint8) stream_type, stream);
@ -1108,7 +1108,7 @@ mpegts_base_chain (GstPad * pad, GstBuffer * buf)
/* we need to push section packet downstream */ /* we need to push section packet downstream */
res = mpegts_base_push (base, &packet, &section); res = mpegts_base_push (base, &packet, &section);
} else if (base->is_pes[packet.pid]) { } else if (MPEGTS_BIT_IS_SET (base->is_pes, packet.pid)) {
/* push the packet downstream */ /* push the packet downstream */
res = mpegts_base_push (base, &packet, NULL); res = mpegts_base_push (base, &packet, NULL);
} else } else

12
gst/mpegtsdemux/mpegtsbase.h
View file

@ -105,10 +105,10 @@ struct _MpegTSBase {
GstStructure *pat; GstStructure *pat;
MpegTSPacketizer2 *packetizer; MpegTSPacketizer2 *packetizer;
/* arrays that say whether a pid is a known psi pid or a pes pid /* arrays that say whether a pid is a known psi pid or a pes pid */
* FIXME: Make these bit arrays so we can make them 8 times smaller */ /* Use MPEGTS_BIT_* to set/unset/check the values */
gboolean *known_psi; guint8 *known_psi;
gboolean *is_pes; guint8 *is_pes;
gboolean disposed; gboolean disposed;
@ -162,6 +162,10 @@ struct _MpegTSBaseClass {
void (*eit_info) (GstStructure *eit); void (*eit_info) (GstStructure *eit);
}; };
#define MPEGTS_BIT_SET(field, offs) ((field)[(offs) / 8] |= (1 << ((offs) % 8)))
#define MPEGTS_BIT_UNSET(field, offs) ((field)[(offs) / 8] &= ~(1 << ((offs) % 8)))
#define MPEGTS_BIT_IS_SET(field, offs) ((field)[(offs) / 8] & (1 << ((offs) % 8)))
GType mpegts_base_get_type(void); GType mpegts_base_get_type(void);
MpegTSBaseProgram *mpegts_base_get_program (MpegTSBase * base, gint program_number); MpegTSBaseProgram *mpegts_base_get_program (MpegTSBase * base, gint program_number);

2
gst/mpegtsdemux/tsdemux.c
View file

@ -1051,7 +1051,7 @@ create_pad_for_stream (MpegTSBase * base, MpegTSBaseStream * bstream,
case ST_DSMCC_B: case ST_DSMCC_B:
case ST_DSMCC_C: case ST_DSMCC_C:
case ST_DSMCC_D: case ST_DSMCC_D:
base->is_pes[bstream->pid] = FALSE; MPEGTS_BIT_UNSET (base->is_pes, bstream->pid);
break; break;
case ST_AUDIO_AAC: case ST_AUDIO_AAC:
template = gst_static_pad_template_get (&audio_template); template = gst_static_pad_template_get (&audio_template);