mpegdemux: do not skip pes packets that we think are encrypted

pes packets that claim to be encrypted may not be so, so treat as normal.
Just log the flags.
This commit is contained in:
Josep Torra 2009-01-28 12:41:36 +00:00 committed by Zaheer Merali
parent 6bbce931bc
commit 3b7f1bc988

View file

@ -287,7 +287,7 @@ gst_pes_filter_parse (GstPESFilter * filter)
/* check PES scrambling control */
if ((flags & 0x30) != 0)
goto encrypted;
GST_DEBUG ("PES scrambling control: %x", (flags >> 4) & 0x3);
/* 2: PTS_DTS_flags
* 1: ESCR_flag
@ -479,17 +479,6 @@ skip:
gst_adapter_flush (filter->adapter, avail);
ADAPTER_OFFSET_FLUSH (avail);
filter->length -= avail - 6;
if (filter->length > 0 || filter->unbounded_packet)
filter->state = STATE_DATA_SKIP;
return GST_FLOW_OK;
}
encrypted:
{
GST_DEBUG ("skipping encrypted 0x%02x", filter->id);
gst_adapter_flush (filter->adapter, avail);
ADAPTER_OFFSET_FLUSH (avail);
filter->length -= avail - 6;
if (filter->length > 0 || filter->unbounded_packet)
filter->state = STATE_DATA_SKIP;