mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtspacketizer: Speedup packet parsing

Browse source 
Avoid using bitshifting where not needed.

Speeds up packet parsing by 3% (this is *the* hotspot of mpeg-ts elements).
This commit is contained in:
Edward Hervey 2013-06-23 15:26:14 +02:00
parent b00192d7c0
commit 9fd7f1c082
3 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gst/mpegtsdemux/mpegtspacketizer.c
View file

@ -508,7 +508,7 @@ mpegts_packetizer_parse_adaptation_field_control (MpegTSPacketizer2 *
return TRUE;
}
if (packet->adaptation_field_control == 0x02) {
if (packet->adaptation_field_control == 0x20) {
/* no payload, adaptation field of 183 bytes */
if (length != 183) {
GST_DEBUG ("PID %d afc == 0x%x and length %d != 183",
@ -567,40 +567,43 @@ mpegts_packetizer_parse_packet (MpegTSPacketizer2 * packetizer,
MpegTSPacketizerPacket * packet)
{
guint8 *data;
guint8 tmp;
data = packet->data_start;
data++;
data += 1;
tmp = *data;
/* transport_error_indicator 1 */
if (G_UNLIKELY (*data >> 7))
if (G_UNLIKELY (tmp & 0x80))
return PACKET_BAD;
/* payload_unit_start_indicator 1 */
packet->payload_unit_start_indicator = (*data >> 6) & 0x01;
packet->payload_unit_start_indicator = tmp & 0x40;
/* transport_priority 1 */
/* PID 13 */
packet->pid = GST_READ_UINT16_BE (data) & 0x1FFF;
data += 2;
tmp = *data;
/* transport_scrambling_control 2 */
if (G_UNLIKELY (*data >> 6))
if (G_UNLIKELY (tmp & 0xc0))
return PACKET_BAD;
/* adaptation_field_control 2 */
packet->adaptation_field_control = (*data >> 4) & 0x03;
packet->adaptation_field_control = tmp & 0x30;
/* continuity_counter 4 */
packet->continuity_counter = *data & 0x0F;
packet->continuity_counter = tmp & 0x0F;
data += 1;
packet->data = data;
if (packet->adaptation_field_control & 0x02)
if (packet->adaptation_field_control & 0x20)
if (!mpegts_packetizer_parse_adaptation_field_control (packetizer, packet))
return FALSE;
if (packet->adaptation_field_control & 0x01)
if (packet->adaptation_field_control & 0x10)
packet->payload = packet->data;
else
packet->payload = NULL;
@ -2789,7 +2792,7 @@ mpegts_packetizer_push_section (MpegTSPacketizer2 * packetizer,
data = packet->data;
section->pid = packet->pid;
if (packet->payload_unit_start_indicator == 1) {
if (packet->payload_unit_start_indicator) {
pointer = *data++;
if (data + pointer > packet->data_end) {
GST_WARNING ("PID 0x%04x PSI section pointer points past the end "

2
gst/mpegtsdemux/mpegtspacketizer.h
View file

@ -153,7 +153,7 @@ typedef struct
* section when the section_syntax_indicator is set to a value of "1". If
* section_syntax_indicator is 0, sub_table_extension will be set to 0 */
guint16 subtable_extension;
guint8 version_number;
guint8 version_number;
GList * crc;
} MpegTSPacketizerStreamSubtable;

2
gst/mpegtsdemux/tsdemux.c
View file

@ -1559,7 +1559,7 @@ gst_ts_demux_handle_packet (GstTSDemux * demux, TSDemuxStream * stream,
}
if (G_UNLIKELY (packet->payload_unit_start_indicator) &&
packet->adaptation_field_control & 0x1)
packet->adaptation_field_control & 0x10)
/* Flush previous data */
res = gst_ts_demux_push_pending_data (demux, stream);