projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f5a723a
)
[common] improve detection for video only formats and m3u8 manifest(fixes #11507)
author
Remita Amine
<remitamine@gmail.com>
Thu, 22 Dec 2016 09:02:56 +0000
(10:02 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Thu, 22 Dec 2016 09:02:56 +0000
(10:02 +0100)
youtube_dl/extractor/common.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 58da2702526be72dc9c9415919d97e34375f064a..07d101aef8f1e4426ee26eaf36c307efe8b23bb9 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-1225,7
+1225,7
@@
class InfoExtractor(object):
'protocol': entry_protocol,
'preference': preference,
}]
'protocol': entry_protocol,
'preference': preference,
}]
- audio_
groups = set()
+ audio_
in_video_stream = {}
last_info = {}
last_media = {}
for line in m3u8_doc.splitlines():
last_info = {}
last_media = {}
for line in m3u8_doc.splitlines():
@@
-1235,10
+1235,11
@@
class InfoExtractor(object):
media = parse_m3u8_attributes(line)
media_type = media.get('TYPE')
if media_type in ('VIDEO', 'AUDIO'):
media = parse_m3u8_attributes(line)
media_type = media.get('TYPE')
if media_type in ('VIDEO', 'AUDIO'):
+ group_id = media.get('GROUP-ID')
media_url = media.get('URI')
if media_url:
format_id = []
media_url = media.get('URI')
if media_url:
format_id = []
- for v in (
media.get('GROUP-ID')
, media.get('NAME')):
+ for v in (
group_id
, media.get('NAME')):
if v:
format_id.append(v)
f = {
if v:
format_id.append(v)
f = {
@@
-1251,12
+1252,15
@@
class InfoExtractor(object):
}
if media_type == 'AUDIO':
f['vcodec'] = 'none'
}
if media_type == 'AUDIO':
f['vcodec'] = 'none'
- audio_groups.add(media['GROUP-ID'])
+ if group_id and not audio_in_video_stream.get(group_id):
+ audio_in_video_stream[group_id] = False
formats.append(f)
else:
# When there is no URI in EXT-X-MEDIA let this tag's
# data be used by regular URI lines below
last_media = media
formats.append(f)
else:
# When there is no URI in EXT-X-MEDIA let this tag's
# data be used by regular URI lines below
last_media = media
+ if media_type == 'AUDIO' and group_id:
+ audio_in_video_stream[group_id] = True
elif line.startswith('#') or not line.strip():
continue
else:
elif line.startswith('#') or not line.strip():
continue
else:
@@
-1300,7
+1304,7
@@
class InfoExtractor(object):
'abr': abr,
})
f.update(parse_codecs(last_info.get('CODECS')))
'abr': abr,
})
f.update(parse_codecs(last_info.get('CODECS')))
- if
last_info.get('AUDIO') in audio_groups
:
+ if
audio_in_video_stream.get(last_info.get('AUDIO')) is False
:
# TODO: update acodec for for audio only formats with the same GROUP-ID
f['acodec'] = 'none'
formats.append(f)
# TODO: update acodec for for audio only formats with the same GROUP-ID
f['acodec'] = 'none'
formats.append(f)