R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[downloader/hls] Support preprocessing of m3u8 manifests

Browse Source
This commit is contained in:
Yen Chi Hsuan 2015-07-22 20:03:29 +08:00
parent 1eba6cdd12
commit a714f57bf2
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
youtube_dl/downloader/hls.py
View File

@ -13,6 +13,7 @@ from ..compat import (
from ..utils import ( from ..utils import (
encodeArgument, encodeArgument,
encodeFilename, encodeFilename,
function_pool,
) )
@ -28,9 +29,20 @@ class HlsFD(FileDownloader):
return False return False
ffpp.check_version() ffpp.check_version()
input_arg = url
if info_dict.get('hls_transform_source_key'):
transform_source = function_pool[info_dict['hls_transform_source_key']]
self.to_screen(
'[hls] %s: Downloading m3u8 manifest' % info_dict['id'])
data = self.ydl.urlopen(url).read()
data = transform_source(data)
input_arg = '%s.m3u8' % filename
with open(input_arg, 'wb') as f:
f.write(data)
args = [ args = [
encodeArgument(opt) encodeArgument(opt)
for opt in (ffpp.executable, '-y', '-i', url, '-f', 'mp4', '-c', 'copy', '-bsf:a', 'aac_adtstoasc')] for opt in (ffpp.executable, '-y', '-i', input_arg, '-f', 'mp4', '-c', 'copy', '-bsf:a', 'aac_adtstoasc')]
args.append(encodeFilename(tmpfilename, True)) args.append(encodeFilename(tmpfilename, True))
retval = subprocess.call(args) retval = subprocess.call(args)
@ -44,6 +56,8 @@ class HlsFD(FileDownloader):
'filename': filename, 'filename': filename,
'status': 'finished', 'status': 'finished',
}) })
if info_dict.get('hls_transform_source_key'):
os.remove(input_arg)
return True return True
else: else:
self.to_stderr('\n') self.to_stderr('\n')
@ -62,6 +76,9 @@ class NativeHlsFD(FileDownloader):
self.to_screen( self.to_screen(
'[hlsnative] %s: Downloading m3u8 manifest' % info_dict['id']) '[hlsnative] %s: Downloading m3u8 manifest' % info_dict['id'])
data = self.ydl.urlopen(url).read() data = self.ydl.urlopen(url).read()
if info_dict.get('hls_transform_source_key'):
transform_source = function_pool.get(info_dict['hls_transform_source_key'])
data = transform_source(data)
s = data.decode('utf-8', 'ignore') s = data.decode('utf-8', 'ignore')
segment_urls = [] segment_urls = []
for line in s.splitlines(): for line in s.splitlines():