From b6732a27d34099d50f97209877e20b1f924c3a06 Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward.hervey@collabora.co.uk>
Date: Sat, 26 May 2012 14:08:41 +0200
Subject: [PATCH] pesparse: Be a bit more permissive with PTS/DTS parsing

According to the specifications a PTS_DTS_flags value of 0x01 is forbidden.
... but there are some rare files out there that do that.

Instead of erroring out, let's warn, carry on parsing accordingly.

If the packet is really corrupted there are enough checks afterward to
detect that.
---
 gst/mpegtsdemux/pesparse.c | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/gst/mpegtsdemux/pesparse.c b/gst/mpegtsdemux/pesparse.c
index e5100688d0..ce3ff41a97 100644
--- a/gst/mpegtsdemux/pesparse.c
+++ b/gst/mpegtsdemux/pesparse.c
@@ -137,8 +137,9 @@ mpegts_parse_pes_header (const guint8 * data, gsize length, PESHeader * res,
   /* PTS/DTS */
 
   /* PTS_DTS_flags == 0x01 is invalid */
-  if (G_UNLIKELY ((flags >> 6) == 0x01))
-    goto bad_PTS_DTS_flags;
+  if (G_UNLIKELY ((flags >> 6) == 0x01)) {
+    GST_WARNING ("Invalid PTS_DTS_flag (0x01 is forbidden)");
+  }
 
   if ((flags & 0x80) == 0x80) {
     /* PTS */
@@ -150,17 +151,18 @@ mpegts_parse_pes_header (const guint8 * data, gsize length, PESHeader * res,
     GST_LOG ("PTS %" G_GUINT64_FORMAT " %" GST_TIME_FORMAT,
         res->PTS, GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (res->PTS)));
 
-    if ((flags & 0x40) == 0x40) {
-      /* DTS */
-      if (G_UNLIKELY (length < 5))
-        goto need_more_data;
+  }
 
-      READ_TS (data, res->DTS, bad_DTS_value);
-      length -= 5;
+  if ((flags & 0x40) == 0x40) {
+    /* DTS */
+    if (G_UNLIKELY (length < 5))
+      goto need_more_data;
 
-      GST_LOG ("DTS %" G_GUINT64_FORMAT " %" GST_TIME_FORMAT,
-          res->DTS, GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (res->DTS)));
-    }
+    READ_TS (data, res->DTS, bad_DTS_value);
+    length -= 5;
+
+    GST_LOG ("DTS %" G_GUINT64_FORMAT " %" GST_TIME_FORMAT,
+        res->DTS, GST_TIME_ARGS (MPEGTIME_TO_GSTTIME (res->DTS)));
   }
 
   if (flags & 0x20) {
@@ -380,10 +382,6 @@ bad_marker_1:
       val8);
   return PES_PARSING_BAD;
 
-bad_PTS_DTS_flags:
-  GST_WARNING ("Invalid '0x01' PTS_DTS_flags");
-  return PES_PARSING_BAD;
-
 bad_PTS_value:
   GST_WARNING ("bad PTS value");
   return PES_PARSING_BAD;