[extractor/common] Generate better f4m format IDs
This commit is contained in:
		@@ -620,11 +620,15 @@ class InfoExtractor(object):
 | 
				
			|||||||
            'Unable to download f4m manifest')
 | 
					            'Unable to download f4m manifest')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        formats = []
 | 
					        formats = []
 | 
				
			||||||
        for media_el in manifest.findall('{http://ns.adobe.com/f4m/1.0}media'):
 | 
					        media_nodes = manifest.findall('{http://ns.adobe.com/f4m/1.0}media')
 | 
				
			||||||
 | 
					        for i, media_el in enumerate(media_nodes):
 | 
				
			||||||
 | 
					            tbr = int_or_none(media_el.attrib.get('bitrate'))
 | 
				
			||||||
 | 
					            format_id = 'f4m-%d' % (i if tbr is None else tbr)
 | 
				
			||||||
            formats.append({
 | 
					            formats.append({
 | 
				
			||||||
 | 
					                'format_id': format_id,
 | 
				
			||||||
                'url': manifest_url,
 | 
					                'url': manifest_url,
 | 
				
			||||||
                'ext': 'flv',
 | 
					                'ext': 'flv',
 | 
				
			||||||
                'tbr': int_or_none(media_el.attrib.get('bitrate')),
 | 
					                'tbr': tbr,
 | 
				
			||||||
                'width': int_or_none(media_el.attrib.get('width')),
 | 
					                'width': int_or_none(media_el.attrib.get('width')),
 | 
				
			||||||
                'height': int_or_none(media_el.attrib.get('height')),
 | 
					                'height': int_or_none(media_el.attrib.get('height')),
 | 
				
			||||||
            })
 | 
					            })
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user