depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-30 06:01:50 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5556 from jaimeMF/best-format-nodash

Browse source 
Make 'best' format only match non-DASH formats (closes #5554)
This commit is contained in:
Sergey M. 2015-04-30 19:57:02 +05:00
commit 4d72df4031
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/test_YoutubeDL.py
View file

@ -237,7 +237,7 @@ class TestFormatSelection(unittest.TestCase):
f2['url'] = 'url:' + f2id
info_dict = _make_result([f1, f2], extractor='youtube')
ydl = YDL()
ydl = YDL({'format': 'best/bestvideo'})
yie = YoutubeIE(ydl)
yie._sort_formats(info_dict['formats'])
ydl.process_ie_result(info_dict)
@ -245,7 +245,7 @@ class TestFormatSelection(unittest.TestCase):
self.assertEqual(downloaded['format_id'], f1id)
info_dict = _make_result([f2, f1], extractor='youtube')
ydl = YDL()
ydl = YDL({'format': 'best/bestvideo'})
yie = YoutubeIE(ydl)
yie._sort_formats(info_dict['formats'])
ydl.process_ie_result(info_dict)

9
youtube_dl/YoutubeDL.py
View file

@ -915,7 +915,14 @@ class YoutubeDL(object):
return None
if format_spec == 'best' or format_spec is None:
return available_formats[-1]
audiovideo_formats = [
f for f in available_formats
if f.get('vcodec') != 'none' and f.get('acodec') != 'none']
if audiovideo_formats:
return audiovideo_formats[-1]
# for audio only urls, 'best' selects the best audio format
elif all(f.get('acodec') != 'none' for f in available_formats):
return available_formats[-1]
elif format_spec == 'worst':
audiovideo_formats = [
f for f in available_formats