aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-12-26 21:08:52 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2013-12-26 21:08:52 +0100
commit12c978739a56b1e81c72416bfab37908e0543832 (patch)
treec25485935fd5e9e260dccc36418549b4541d3a33
parent4bc60dafebb34fc8a403b57818bb2f1660218818 (diff)
downloadyoutube-dl-12c978739a56b1e81c72416bfab37908e0543832.tar.xz
[internetvideoarchive] Use centralized format sorting
-rw-r--r--youtube_dl/extractor/internetvideoarchive.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/youtube_dl/extractor/internetvideoarchive.py b/youtube_dl/extractor/internetvideoarchive.py
index 16a6f73c8..4ddda2f1b 100644
--- a/youtube_dl/extractor/internetvideoarchive.py
+++ b/youtube_dl/extractor/internetvideoarchive.py
@@ -5,7 +5,6 @@ from ..utils import (
compat_urlparse,
compat_urllib_parse,
xpath_with_ns,
- determine_ext,
)
@@ -63,13 +62,17 @@ class InternetVideoArchiveIE(InfoExtractor):
for content in item.findall(_bp('media:group/media:content')):
attr = content.attrib
f_url = attr['url']
+ width = int(attr['width'])
+ bitrate = int(attr['bitrate'])
+ format_id = '%d-%dk' % (width, bitrate)
formats.append({
+ 'format_id': format_id,
'url': f_url,
- 'ext': determine_ext(f_url),
- 'width': int(attr['width']),
- 'bitrate': int(attr['bitrate']),
+ 'width': width,
+ 'tbr': bitrate,
})
- formats = sorted(formats, key=lambda f: f['bitrate'])
+
+ self._sort_formats(formats)
return {
'id': video_id,