Merge pull request #8328 from remitamine/hls-master-detect

[extractor/common] detect media playlist in _extract_m3u8_formats

diff --combined youtube_dl/extractor/common.py
index f5a35838886e718d1c0064c28783ff8fb0f3e928,11191c173a9b216989b851d44d8dbdfaa92b08fa..33290fd7474e85ca559f5f3caa7a9aacf414e2a9
--- 1/youtube_dl/extractor/common.py
--- 2/youtube_dl/extractor/common.py
+++ b/youtube_dl/extractor/common.py
@@@ -825,12 -825,6 +825,12 @@@ class InfoExtractor(object)
          if not formats:
              raise ExtractorError('No video formats found')
  
 +        for f in formats:
 +            # Automatically determine tbr when missing based on abr and vbr (improves
 +            # formats sorting in some cases)
 +            if 'tbr' not in f and 'abr' in f and 'vbr' in f:
 +                f['tbr'] = f['abr'] + f['vbr']
 +
          def _formats_key(f):
              # TODO remove the following workaround
              from ..utils import determine_ext
@@@ -1020,6 -1014,18 +1020,18 @@@
              return []
          m3u8_doc, urlh = res
          m3u8_url = urlh.geturl()
+         # A Media Playlist Tag MUST NOT appear in a Master Playlist
+         # https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.3
+         # The EXT-X-TARGETDURATION tag is REQUIRED for every M3U8 Media Playlists
+         # https://tools.ietf.org/html/draft-pantos-http-live-streaming-17#section-4.3.3.1
+         if '#EXT-X-TARGETDURATION' in m3u8_doc:
+             return [{
+                 'url': m3u8_url,
+                 'format_id': m3u8_id,
+                 'ext': ext,
+                 'protocol': entry_protocol,
+                 'preference': preference,
+             }]
          last_info = None
          last_media = None
          kv_rex = re.compile(
@@@ -1170,6 -1176,7 +1182,7 @@@
          formats = []
          rtmp_count = 0
          http_count = 0
+         m3u8_count = 0
  
          videos = smil.findall(self._xpath_ns('.//video', namespace))
          for video in videos:
@@@ -1209,8 -1216,17 +1222,17 @@@
              src_url = src if src.startswith('http') else compat_urlparse.urljoin(base, src)
  
              if proto == 'm3u8' or src_ext == 'm3u8':
-                 formats.extend(self._extract_m3u8_formats(
-                     src_url, video_id, ext or 'mp4', m3u8_id='hls', fatal=False))
+                 m3u8_formats = self._extract_m3u8_formats(
+                     src_url, video_id, ext or 'mp4', m3u8_id='hls', fatal=False)
+                 if len(m3u8_formats) == 1:
+                     m3u8_count += 1
+                     m3u8_formats[0].update({
+                         'format_id': 'hls-%d' % (m3u8_count if bitrate is None else bitrate),
+                         'tbr': bitrate,
+                         'width': width,
+                         'height': height,
+                     })
+                 formats.extend(m3u8_formats)
                  continue
  
              if src_ext == 'f4m':