update from upstream

1 files changed, 13 insertions, 11 deletions

diff --git a/hypervideo_dl/extractor/threeqsdn.py b/hypervideo_dl/extractor/threeqsdn.py
index f6d37bb..bb76103 100644
--- a/hypervideo_dl/extractor/threeqsdn.py
+++ b/hypervideo_dl/extractor/threeqsdn.py
@@ -99,16 +99,21 @@ class ThreeQSDNIE(InfoExtractor):
         aspect = float_or_none(config.get('aspect'))
 
         formats = []
+        subtitles = {}
         for source_type, source in (config.get('sources') or {}).items():
             if not source:
                 continue
             if source_type == 'dash':
-                formats.extend(self._extract_mpd_formats(
-                    source, video_id, mpd_id='mpd', fatal=False))
+                fmts, subs = self._extract_mpd_formats_and_subtitles(
+                    source, video_id, mpd_id='mpd', fatal=False)
+                formats.extend(fmts)
+                subtitles = self._merge_subtitles(subtitles, subs)
             elif source_type == 'hls':
-                formats.extend(self._extract_m3u8_formats(
+                fmts, subs = self._extract_m3u8_formats_and_subtitles(
                     source, video_id, 'mp4', 'm3u8' if live else 'm3u8_native',
-                    m3u8_id='hls', fatal=False))
+                    m3u8_id='hls', fatal=False)
+                formats.extend(fmts)
+                subtitles = self._merge_subtitles(subtitles, subs)
             elif source_type == 'progressive':
                 for s in source:
                     src = s.get('src')
@@ -133,14 +138,11 @@ class ThreeQSDNIE(InfoExtractor):
                         'vcodec': 'none' if height == 0 else None,
                         'width': width,
                     })
-        for f in formats:
-            if f.get('acodec') == 'none':
-                f['preference'] = -40
-            elif f.get('vcodec') == 'none':
-                f['preference'] = -50
-        self._sort_formats(formats, ('preference', 'width', 'height', 'source_preference', 'tbr', 'vbr', 'abr', 'ext', 'format_id'))
+        # It seems like this would be correctly handled by default
+        # However, unless someone can confirm this, the old
+        # behaviour is being kept as-is
+        self._sort_formats(formats, ('res', 'source_preference'))
 
-        subtitles = {}
         for subtitle in (config.get('subtitles') or []):
             src = subtitle.get('src')
             if not src: