w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8408 from remitamine/dash

Browse source 
Add generic support for mpd manifests(dash formats)
This commit is contained in:
remitamine 2016-02-06 06:26:02 +01:00
commit 66159b38aa
5 changed files with 160 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
youtube_dl/downloader/dash.py
View file

@ -40,6 +40,7 @@ class DashSegmentsFD(FileDownloader):
return '%s%s%s' % (base_url, '' if base_url.endswith('/') else '/', target_url) return '%s%s%s' % (base_url, '' if base_url.endswith('/') else '/', target_url)
with open(tmpfilename, 'wb') as outf: with open(tmpfilename, 'wb') as outf:
if info_dict.get('initialization_url'):
append_url_to_file( append_url_to_file(
outf, combine_url(base_url, info_dict['initialization_url']), outf, combine_url(base_url, info_dict['initialization_url']),
'initialization segment') 'initialization segment')

172
youtube_dl/extractor/common.py
View file

@ -1,4 +1,4 @@
from __future__ import unicode_literals from __future__ import unicode_literals, division
import base64 import base64
import datetime import datetime
@ -10,6 +10,7 @@ import re
import socket import socket
import sys import sys
import time import time
import math
from ..compat import ( from ..compat import (
compat_cookiejar, compat_cookiejar,
@ -44,6 +45,7 @@ from ..utils import (
xpath_text, xpath_text,
xpath_with_ns, xpath_with_ns,
determine_protocol, determine_protocol,
parse_duration,
) )
@ -1330,76 +1332,150 @@ class InfoExtractor(object):
}) })
return entries return entries
def _download_dash_manifest(self, dash_manifest_url, video_id, fatal=True): def _extract_mpd_formats(self, mpd_url, video_id, mpd_id=None, note=None, errnote=None, fatal=True, formats_dict={}):
return self._download_xml( res = self._download_webpage_handle(
dash_manifest_url, video_id, mpd_url, video_id,
note='Downloading DASH manifest', note=note or 'Downloading MPD manifest',
errnote='Could not download DASH manifest', errnote=errnote or 'Failed to download MPD manifest',
fatal=fatal) fatal=fatal)
if res is False:
return []
mpd, urlh = res
mpd_base_url = re.match(r'https?://.+/', urlh.geturl()).group()
def _extract_dash_manifest_formats(self, dash_manifest_url, video_id, fatal=True, namespace=None, formats_dict={}): return self._parse_mpd(
dash_doc = self._download_dash_manifest(dash_manifest_url, video_id, fatal) compat_etree_fromstring(mpd.encode('utf-8')), mpd_id, mpd_base_url, formats_dict=formats_dict)
if dash_doc is False:
def _parse_mpd(self, mpd_doc, mpd_id=None, mpd_base_url='', formats_dict={}):
if mpd_doc.get('type') == 'dynamic':
return [] return []
return self._parse_dash_manifest( namespace = self._search_regex(r'(?i)^{([^}]+)?}MPD$', mpd_doc.tag, 'namespace')
dash_doc, namespace=namespace, formats_dict=formats_dict)
def _parse_dash_manifest(self, dash_doc, namespace=None, formats_dict={}):
def _add_ns(path): def _add_ns(path):
return self._xpath_ns(path, namespace) return self._xpath_ns(path, namespace)
def is_drm_protected(element):
return element.find(_add_ns('ContentProtection')) is not None
def extract_multisegment_info(element, ms_parent_info):
ms_info = ms_parent_info.copy()
segment_list = element.find(_add_ns('SegmentList'))
if segment_list is not None:
segment_urls_e = segment_list.findall(_add_ns('SegmentURL'))
if segment_urls_e:
ms_info['segment_urls'] = [segment.attrib['media'] for segment in segment_urls_e]
initialization = segment_list.find(_add_ns('Initialization'))
if initialization is not None:
ms_info['initialization_url'] = initialization.attrib['sourceURL']
else:
segment_template = element.find(_add_ns('SegmentTemplate'))
if segment_template is not None:
start_number = segment_template.get('startNumber')
if start_number:
ms_info['start_number'] = int(start_number)
segment_timeline = segment_template.find(_add_ns('SegmentTimeline'))
if segment_timeline is not None:
s_e = segment_timeline.findall(_add_ns('S'))
if s_e:
ms_info['total_number'] = 0
for s in s_e:
ms_info['total_number'] += 1 + int(s.get('r', '0'))
else:
timescale = segment_template.get('timescale')
if timescale:
ms_info['timescale'] = int(timescale)
segment_duration = segment_template.get('duration')
if segment_duration:
ms_info['segment_duration'] = int(segment_duration)
media_template = segment_template.get('media')
if media_template:
ms_info['media_template'] = media_template
initialization = segment_template.get('initialization')
if initialization:
ms_info['initialization_url'] = initialization
else:
initialization = segment_template.find(_add_ns('Initialization'))
if initialization is not None:
ms_info['initialization_url'] = initialization.attrib['sourceURL']
return ms_info
mpd_duration = parse_duration(mpd_doc.get('mediaPresentationDuration'))
formats = [] formats = []
for a in dash_doc.findall('.//' + _add_ns('AdaptationSet')): for period in mpd_doc.findall(_add_ns('Period')):
mime_type = a.attrib.get('mimeType') period_duration = parse_duration(period.get('duration')) or mpd_duration
for r in a.findall(_add_ns('Representation')): period_ms_info = extract_multisegment_info(period, {
mime_type = r.attrib.get('mimeType') or mime_type 'start_number': 1,
url_el = r.find(_add_ns('BaseURL')) 'timescale': 1,
if mime_type == 'text/vtt': })
for adaptation_set in period.findall(_add_ns('AdaptationSet')):
if is_drm_protected(adaptation_set):
continue
adaption_set_ms_info = extract_multisegment_info(adaptation_set, period_ms_info)
for representation in adaptation_set.findall(_add_ns('Representation')):
if is_drm_protected(representation):
continue
representation_attrib = adaptation_set.attrib.copy()
representation_attrib.update(representation.attrib)
mime_type = representation_attrib.get('mimeType')
content_type = mime_type.split('/')[0] if mime_type else representation_attrib.get('contentType')
if content_type == 'text':
# TODO implement WebVTT downloading # TODO implement WebVTT downloading
pass pass
elif mime_type.startswith('audio/') or mime_type.startswith('video/'): elif content_type == 'video' or content_type == 'audio':
segment_list = r.find(_add_ns('SegmentList')) base_url = ''
format_id = r.attrib['id'] for element in (representation, adaptation_set, period, mpd_doc):
video_url = url_el.text if url_el is not None else None base_url_e = element.find(_add_ns('BaseURL'))
filesize = int_or_none(url_el.attrib.get('{http://youtube.com/yt/2012/10/10}contentLength') if url_el is not None else None) if base_url_e is not None:
base_url = base_url_e.text + base_url
if re.match(r'^https?://', base_url):
break
if not re.match(r'^https?://', base_url):
base_url = mpd_base_url + base_url
representation_id = representation_attrib.get('id')
lang = representation_attrib.get('lang')
f = { f = {
'format_id': format_id, 'format_id': mpd_id or representation_id,
'url': video_url, 'url': base_url,
'width': int_or_none(r.attrib.get('width')), 'width': int_or_none(representation_attrib.get('width')),
'height': int_or_none(r.attrib.get('height')), 'height': int_or_none(representation_attrib.get('height')),
'tbr': int_or_none(r.attrib.get('bandwidth'), 1000), 'tbr': int_or_none(representation_attrib.get('bandwidth'), 1000),
'asr': int_or_none(r.attrib.get('audioSamplingRate')), 'asr': int_or_none(representation_attrib.get('audioSamplingRate')),
'filesize': filesize, 'fps': int_or_none(representation_attrib.get('frameRate')),
'fps': int_or_none(r.attrib.get('frameRate')), 'vcodec': 'none' if content_type == 'audio' else representation_attrib.get('codecs'),
'acodec': 'none' if content_type == 'video' else representation_attrib.get('codecs'),
'language': lang if lang not in ('mul', 'und', 'zxx', 'mis') else None,
'format_note': 'DASH %s' % content_type,
} }
if segment_list is not None: representation_ms_info = extract_multisegment_info(representation, adaption_set_ms_info)
initialization_url = segment_list.find(_add_ns('Initialization')).attrib['sourceURL'] if 'segment_urls' not in representation_ms_info and 'media_template' in representation_ms_info:
if 'total_number' not in representation_ms_info and 'segment_duration':
segment_duration = representation_ms_info['segment_duration'] / representation_ms_info['timescale']
representation_ms_info['total_number'] = int(math.ceil(period_duration / segment_duration))
media_template = representation_ms_info['media_template']
media_template = media_template.replace('$RepresentationID$', representation_id)
media_template = re.sub(r'\$(Number|Bandwidth)(?:%(0\d+)d)?\$', r'%(\1)\2d', media_template)
media_template.replace('$$', '$')
representation_ms_info['segment_urls'] = [media_template % {'Number': segment_number, 'Bandwidth': representation_attrib.get('bandwidth')} for segment_number in range(representation_ms_info['start_number'], representation_ms_info['total_number'] + representation_ms_info['start_number'])]
if 'segment_urls' in representation_ms_info:
f.update({
'segment_urls': representation_ms_info['segment_urls'],
'protocol': 'http_dash_segments',
})
if 'initialization_url' in representation_ms_info:
initialization_url = representation_ms_info['initialization_url'].replace('$RepresentationID$', representation_id)
f.update({ f.update({
'initialization_url': initialization_url, 'initialization_url': initialization_url,
'segment_urls': [segment.attrib.get('media') for segment in segment_list.findall(_add_ns('SegmentURL'))],
'protocol': 'http_dash_segments',
}) })
if not f.get('url'): if not f.get('url'):
f['url'] = initialization_url f['url'] = initialization_url
try: try:
existing_format = next( existing_format = next(
fo for fo in formats fo for fo in formats
if fo['format_id'] == format_id) if fo['format_id'] == representation_id)
except StopIteration: except StopIteration:
full_info = formats_dict.get(format_id, {}).copy() full_info = formats_dict.get(representation_id, {}).copy()
full_info.update(f) full_info.update(f)
codecs = r.attrib.get('codecs')
if codecs:
if mime_type.startswith('video/'):
vcodec, acodec = codecs, 'none'
else: # mime_type.startswith('audio/')
vcodec, acodec = 'none', codecs
full_info.update({
'vcodec': vcodec,
'acodec': acodec,
})
formats.append(full_info) formats.append(full_info)
else: else:
existing_format.update(f) existing_format.update(f)

5
youtube_dl/extractor/facebook.py
View file

@ -215,9 +215,8 @@ class FacebookIE(InfoExtractor):
}) })
dash_manifest = f[0].get('dash_manifest') dash_manifest = f[0].get('dash_manifest')
if dash_manifest: if dash_manifest:
formats.extend(self._parse_dash_manifest( formats.extend(self._parse_mpd(
compat_etree_fromstring(compat_urllib_parse_unquote_plus(dash_manifest)), compat_etree_fromstring(compat_urllib_parse_unquote_plus(dash_manifest))))
namespace='urn:mpeg:dash:schema:mpd:2011'))
if not formats: if not formats:
raise ExtractorError('Cannot find video formats') raise ExtractorError('Cannot find video formats')

8
youtube_dl/extractor/vevo.py
View file

@ -197,8 +197,14 @@ class VevoIE(InfoExtractor):
if not version_url: if not version_url:
continue continue
if '.mpd' in version_url or '.ism' in version_url: if '.ism' in version_url:
continue continue
elif '.mpd' in version_url:
formats.extend(self._extract_mpd_formats(
version_url, video_id, mpd_id='dash-%s' % version,
note='Downloading %s MPD information' % version,
errnote='Failed to download %s MPD information' % version,
fatal=False))
elif '.m3u8' in version_url: elif '.m3u8' in version_url:
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(
version_url, video_id, 'mp4', 'm3u8_native', version_url, video_id, 'mp4', 'm3u8_native',

10
youtube_dl/extractor/youtube.py
View file

@ -1464,7 +1464,7 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
# Look for the DASH manifest # Look for the DASH manifest
if self._downloader.params.get('youtube_include_dash_manifest', True): if self._downloader.params.get('youtube_include_dash_manifest', True):
dash_mpd_fatal = True dash_mpd_fatal = True
for dash_manifest_url in dash_mpds: for mpd_url in dash_mpds:
dash_formats = {} dash_formats = {}
try: try:
def decrypt_sig(mobj): def decrypt_sig(mobj):
@ -1472,11 +1472,11 @@ class YoutubeIE(YoutubeBaseInfoExtractor):
dec_s = self._decrypt_signature(s, video_id, player_url, age_gate) dec_s = self._decrypt_signature(s, video_id, player_url, age_gate)
return '/signature/%s' % dec_s return '/signature/%s' % dec_s
dash_manifest_url = re.sub(r'/s/([a-fA-F0-9\.]+)', decrypt_sig, dash_manifest_url) mpd_url = re.sub(r'/s/([a-fA-F0-9\.]+)', decrypt_sig, mpd_url)
for df in self._extract_dash_manifest_formats( for df in self._extract_mpd_formats(
dash_manifest_url, video_id, fatal=dash_mpd_fatal, mpd_url, video_id, fatal=dash_mpd_fatal,
namespace='urn:mpeg:DASH:schema:MPD:2011', formats_dict=self._formats): formats_dict=self._formats):
# Do not overwrite DASH format found in some previous DASH manifest # Do not overwrite DASH format found in some previous DASH manifest
if df['format_id'] not in dash_formats: if df['format_id'] not in dash_formats:
dash_formats[df['format_id']] = df dash_formats[df['format_id']] = df