[soundcloud] Improve AAC format extraction (closes #19173, closes #24708)
authorSergey M․ <dstftw@gmail.com>
Fri, 10 Apr 2020 10:24:21 +0000 (17:24 +0700)
committerSergey M․ <dstftw@gmail.com>
Fri, 10 Apr 2020 10:26:03 +0000 (17:26 +0700)
youtube_dl/extractor/soundcloud.py

index 02d56184dd91cfacbfe2fa506bce2d2c9d576805..422ce16262334ad0f72035e599d01742991f27d4 100644 (file)
@@ -246,7 +246,12 @@ class SoundcloudIE(InfoExtractor):
                 'comment_count': int,
                 'repost_count': int,
             },
-        }
+        },
+        {
+            # with AAC HQ format available via OAuth token
+            'url': 'https://soundcloud.com/wandw/the-chainsmokers-ft-daya-dont-let-me-down-ww-remix-1',
+            'only_matching': True,
+        },
     ]
 
     _API_V2_BASE = 'https://api-v2.soundcloud.com/'
@@ -350,7 +355,8 @@ class SoundcloudIE(InfoExtractor):
             format_id_list = []
             if protocol:
                 format_id_list.append(protocol)
-            if f.get('ext') == 'aac':
+            ext = f.get('ext')
+            if ext == 'aac':
                 f['abr'] = '256'
             for k in ('ext', 'abr'):
                 v = f.get(k)
@@ -362,9 +368,13 @@ class SoundcloudIE(InfoExtractor):
             abr = f.get('abr')
             if abr:
                 f['abr'] = int(abr)
+            if protocol == 'hls':
+                protocol = 'm3u8' if ext == 'aac' else 'm3u8_native'
+            else:
+                protocol = 'http'
             f.update({
                 'format_id': '_'.join(format_id_list),
-                'protocol': 'm3u8_native' if protocol == 'hls' else 'http',
+                'protocol': protocol,
                 'preference': -10 if preview else None,
             })
             formats.append(f)