Imported Upstream version 2014.02.17

[youtubedl] / youtube_dl / extractor / internetvideoarchive.py

diff --git a/youtube_dl/extractor/internetvideoarchive.py b/youtube_dl/extractor/internetvideoarchive.py
index 16a6f73c87e27d47d401c444aa02b80d5a6313b3..4ddda2f1bb86dd534f623218b2acd74566d781e1 100644 (file)
--- 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,
     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']
         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({
             formats.append({

+                'format_id': format_id,

                 'url': f_url,
                 '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,
 
         return {
             'id': video_id,