[rtvnh] extract all formats
This commit is contained in:
		@@ -9,7 +9,7 @@ class RTVNHIE(InfoExtractor):
 | 
			
		||||
    _VALID_URL = r'https?://(?:www\.)?rtvnh\.nl/video/(?P<id>[0-9]+)'
 | 
			
		||||
    _TEST = {
 | 
			
		||||
        'url': 'http://www.rtvnh.nl/video/131946',
 | 
			
		||||
        'md5': '6e1d0ab079e2a00b6161442d3ceacfc1',
 | 
			
		||||
        'md5': 'cdbec9f44550763c8afc96050fa747dc',
 | 
			
		||||
        'info_dict': {
 | 
			
		||||
            'id': '131946',
 | 
			
		||||
            'ext': 'mp4',
 | 
			
		||||
@@ -29,15 +29,29 @@ class RTVNHIE(InfoExtractor):
 | 
			
		||||
            raise ExtractorError(
 | 
			
		||||
                '%s returned error code %d' % (self.IE_NAME, status), expected=True)
 | 
			
		||||
 | 
			
		||||
        formats = self._extract_smil_formats(
 | 
			
		||||
            'http://www.rtvnh.nl/video/smil?m=' + video_id, video_id, fatal=False)
 | 
			
		||||
        formats = []
 | 
			
		||||
        rtmp_formats = self._extract_smil_formats(
 | 
			
		||||
            'http://www.rtvnh.nl/video/smil?m=' + video_id, video_id)
 | 
			
		||||
        formats.extend(rtmp_formats)
 | 
			
		||||
 | 
			
		||||
        for item in meta['source']['fb']:
 | 
			
		||||
            if item.get('type') == 'hls':
 | 
			
		||||
        for rtmp_format in rtmp_formats:
 | 
			
		||||
            rtmp_url = '%s/%s' % (rtmp_format['url'], rtmp_format['play_path'])
 | 
			
		||||
            rtsp_format = rtmp_format.copy()
 | 
			
		||||
            del rtsp_format['play_path']
 | 
			
		||||
            del rtsp_format['ext']
 | 
			
		||||
            rtsp_format.update({
 | 
			
		||||
                'format_id': rtmp_format['format_id'].replace('rtmp', 'rtsp'),
 | 
			
		||||
                'url': rtmp_url.replace('rtmp://', 'rtsp://'),
 | 
			
		||||
                'protocol': 'rtsp',
 | 
			
		||||
            })
 | 
			
		||||
            formats.append(rtsp_format)
 | 
			
		||||
            http_base_url = rtmp_url.replace('rtmp://', 'http://')
 | 
			
		||||
            formats.extend(self._extract_m3u8_formats(
 | 
			
		||||
                    item['file'], video_id, ext='mp4', entry_protocol='m3u8_native'))
 | 
			
		||||
            elif item.get('type') == '':
 | 
			
		||||
                formats.append({'url': item['file']})
 | 
			
		||||
                http_base_url + '/playlist.m3u8', video_id, 'mp4',
 | 
			
		||||
                'm3u8_native', m3u8_id='hls', fatal=False))
 | 
			
		||||
            formats.extend(self._extract_f4m_formats(
 | 
			
		||||
                http_base_url + '/manifest.f4m',
 | 
			
		||||
                video_id, f4m_id='hds', fatal=False))
 | 
			
		||||
        self._sort_formats(formats)
 | 
			
		||||
 | 
			
		||||
        return {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user