]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[extractor/common] Recursively extract child f4m manifests
authorSergey M․ <dstftw@gmail.com>
Wed, 15 Jul 2015 19:15:15 +0000 (01:15 +0600)
committerSergey M․ <dstftw@gmail.com>
Wed, 15 Jul 2015 19:15:15 +0000 (01:15 +0600)
youtube_dl/extractor/common.py

index 78e5cf8d090212c98e42e537360dbaf92713260b..e3c610aa42fa5ff519c2889d11fa757a36279a6e 100644 (file)
@@ -27,6 +27,7 @@ from ..utils import (
     bug_reports_message,
     clean_html,
     compiled_regex_type,
+    determine_ext,
     ExtractorError,
     fix_xml_ampersands,
     float_or_none,
@@ -855,6 +856,13 @@ class InfoExtractor(object):
                 manifest_url = (
                     media_url if media_url.startswith('http://') or media_url.startswith('https://')
                     else ('/'.join(manifest_url.split('/')[:-1]) + '/' + media_url))
+                # If media_url is itself a f4m manifest do the recursive extraction
+                # since bitrates in parent manifest (this one) and media_url manifest
+                # may differ leading to inability to resolve the format by requested
+                # bitrate in f4m downloader
+                if determine_ext(manifest_url) == 'f4m':
+                    formats.extend(self._extract_f4m_formats(manifest_url, video_id, preference, f4m_id))
+                    continue
             tbr = int_or_none(media_el.attrib.get('bitrate'))
             formats.append({
                 'format_id': '-'.join(filter(None, [f4m_id, compat_str(i if tbr is None else tbr)])),