summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorJosep Torra <josep@fluendo.com>2009-01-28 12:41:36 +0000
committerZaheer Merali <zaheerabbas@merali.org>2009-01-28 12:49:39 +0000
commit3b7f1bc988c843f09a5496d78ad11126d07e1761 (patch)
treecdd1408627d7c1f08724350306e345e8be27e072 /gst
parent6bbce931bc57f372e99e25acf56b06e446679863 (diff)
downloadgst-plugins-bad-3b7f1bc988c843f09a5496d78ad11126d07e1761.tar.gz
gst-plugins-bad-3b7f1bc988c843f09a5496d78ad11126d07e1761.tar.bz2
gst-plugins-bad-3b7f1bc988c843f09a5496d78ad11126d07e1761.zip
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.
Diffstat (limited to 'gst')
-rw-r--r--gst/mpegdemux/gstpesfilter.c13
1 files changed, 1 insertions, 12 deletions
diff --git a/gst/mpegdemux/gstpesfilter.c b/gst/mpegdemux/gstpesfilter.c
index 8a2ee284..efdb6cb5 100644
--- a/gst/mpegdemux/gstpesfilter.c
+++ b/gst/mpegdemux/gstpesfilter.c
@@ -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
@@ -484,17 +484,6 @@ skip:
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;
- return GST_FLOW_OK;
- }
lost_sync:
{
GST_DEBUG ("lost sync");