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.

2 files changed, 2 insertions, 13 deletions

diff --git a/common b/common
-Subproject 3f4e9974603807e7615c3a6b8821542abce0be1
+Subproject 5dc8ae302733ce1aae5b1aaa613ce77a8ae4b3d
diff --git a/gst/mpegdemux/gstpesfilter.c b/gst/mpegdemux/gstpesfilter.c
index 8a2ee284..348f75c9 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
@@ -466,7 +466,7 @@ need_more_data:
         ret = GST_FLOW_NEED_MORE_DATA;
       }
     } else {
-      GST_DEBUG ("unbounded need more data %d",
+      GST_DEBG ("unbounded need more data %d",
           gst_adapter_available (filter->adapter));
       ret = GST_FLOW_NEED_MORE_DATA;
     }
@@ -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");