[extractor/common] Added support for f4m manifest Version 2.0

This commit is contained in:
dinesh 2014-10-24 02:41:10 +05:30
parent 2c63ccec78
commit 34e48bed3b

View File

@ -648,6 +648,8 @@ def _extract_f4m_formats(self, manifest_url, video_id):
formats = [] formats = []
media_nodes = manifest.findall('{http://ns.adobe.com/f4m/1.0}media') media_nodes = manifest.findall('{http://ns.adobe.com/f4m/1.0}media')
if not media_nodes:
media_nodes = manifest.findall('{http://ns.adobe.com/f4m/2.0}media')
for i, media_el in enumerate(media_nodes): for i, media_el in enumerate(media_nodes):
tbr = int_or_none(media_el.attrib.get('bitrate')) tbr = int_or_none(media_el.attrib.get('bitrate'))
format_id = 'f4m-%d' % (i if tbr is None else tbr) format_id = 'f4m-%d' % (i if tbr is None else tbr)