Update upstream source from tag 'upstream/2019.09.28'

[youtubedl] / youtube_dl / extractor / ooyala.py

diff --git a/youtube_dl/extractor/ooyala.py b/youtube_dl/extractor/ooyala.py
index 84be2b1e3fe9fec47e915c13b14a8f23c0383232..995b24d1bd4758f0c51350d517a52a83053d584f 100644 (file)
--- a/youtube_dl/extractor/ooyala.py
+++ b/youtube_dl/extractor/ooyala.py
@@ -1,16 +1,21 @@
 from __future__ import unicode_literals
 from __future__ import unicode_literals

+

 import re
 import re

-import base64

 
 from .common import InfoExtractor
 
 from .common import InfoExtractor

+from ..compat import (
+    compat_b64decode,
+    compat_str,
+    compat_urllib_parse_urlencode,
+)

 from ..utils import (
 from ..utils import (

-    int_or_none,
-    float_or_none,
+    determine_ext,

     ExtractorError,
     ExtractorError,

+    float_or_none,
+    int_or_none,
+    try_get,

     unsmuggle_url,
     unsmuggle_url,

-    determine_ext,

 )
 )

-from ..compat import compat_urllib_parse_urlencode

 
 
 class OoyalaBaseIE(InfoExtractor):
 
 
 class OoyalaBaseIE(InfoExtractor):


@@ -26,12 +31,12 @@ class OoyalaBaseIE(InfoExtractor):
         title = metadata['title']
 
         auth_data = self._download_json(
         title = metadata['title']
 
         auth_data = self._download_json(

-            self._AUTHORIZATION_URL_TEMPLATE % (pcode, embed_code) +
-            compat_urllib_parse_urlencode({
+            self._AUTHORIZATION_URL_TEMPLATE % (pcode, embed_code)
+            + compat_urllib_parse_urlencode({

                 'domain': domain,
                 'supportedFormats': supportedformats or 'mp4,rtmp,m3u8,hds,dash,smooth',
                 'embedToken': embed_token,
                 'domain': domain,
                 'supportedFormats': supportedformats or 'mp4,rtmp,m3u8,hds,dash,smooth',
                 'embedToken': embed_token,

-            }), video_id)
+            }), video_id, headers=self.geo_verification_headers())

 
         cur_auth_data = auth_data['authorization_data'][embed_code]
 
 
         cur_auth_data = auth_data['authorization_data'][embed_code]
 


@@ -39,13 +44,15 @@ class OoyalaBaseIE(InfoExtractor):
         formats = []
         if cur_auth_data['authorized']:
             for stream in cur_auth_data['streams']:
         formats = []
         if cur_auth_data['authorized']:
             for stream in cur_auth_data['streams']:

-                s_url = base64.b64decode(
-                    stream['url']['data'].encode('ascii')).decode('utf-8')
-                if s_url in urls:
+                url_data = try_get(stream, lambda x: x['url']['data'], compat_str)
+                if not url_data:
+                    continue
+                s_url = compat_b64decode(url_data).decode('utf-8')
+                if not s_url or s_url in urls:

                     continue
                 urls.append(s_url)
                 ext = determine_ext(s_url, None)
                     continue
                 urls.append(s_url)
                 ext = determine_ext(s_url, None)

-                delivery_type = stream['delivery_type']
+                delivery_type = stream.get('delivery_type')

                 if delivery_type == 'hls' or ext == 'm3u8':
                     formats.extend(self._extract_m3u8_formats(
                         re.sub(r'/ip(?:ad|hone)/', '/all/', s_url), embed_code, 'mp4', 'm3u8_native',
                 if delivery_type == 'hls' or ext == 'm3u8':
                     formats.extend(self._extract_m3u8_formats(
                         re.sub(r'/ip(?:ad|hone)/', '/all/', s_url), embed_code, 'mp4', 'm3u8_native',


@@ -65,7 +72,7 @@ class OoyalaBaseIE(InfoExtractor):
                 else:
                     formats.append({
                         'url': s_url,
                 else:
                     formats.append({
                         'url': s_url,

-                        'ext': ext or stream.get('delivery_type'),
+                        'ext': ext or delivery_type,

                         'vcodec': stream.get('video_codec'),
                         'format_id': delivery_type,
                         'width': int_or_none(stream.get('width')),
                         'vcodec': stream.get('video_codec'),
                         'format_id': delivery_type,
                         'width': int_or_none(stream.get('width')),


@@ -136,6 +143,11 @@ class OoyalaIE(OoyalaBaseIE):
                 'title': 'Divide Tool Path.mp4',
                 'duration': 204.405,
             }
                 'title': 'Divide Tool Path.mp4',
                 'duration': 204.405,
             }

+        },
+        {
+            # empty stream['url']['data']
+            'url': 'http://player.ooyala.com/player.js?embedCode=w2bnZtYjE6axZ_dw1Cd0hQtXd_ige2Is',
+            'only_matching': True,

         }
     ]
 
         }
     ]