rtmp

aliyun · Aug 9, 2016 · 9a57fef · 9a57fef
1 parent 30a9f12
commit 9a57fef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/oss2/api.py b/oss2/api.py
@@ -277,14 +277,10 @@ def sign_url(self, method, key, expires, headers=None, params=None):
                            params=params)
         return self.auth._sign_url(req, self.bucket_name, key, expires)
 
-    def sign_rtmp_url(self, channel_name, playlist_name, expires, params=None):
+    def sign_rtmp_url(self, channel_name, playlist_name, expires):
         """生成RTMP推流的签名URL。
-
         常见的用法是生成加签的URL以供授信用户向OSS推RTMP流。
 
-            >>> bucket.sign_rtmp_url('test_channel', 3600, params = {'use_id': '00001', 'device_id': 'AE9789798BC01'})
-            'http://your-bucket.oss-cn-hangzhou.aliyuncs.com/test_channel?OSSAccessKeyId=9uYePR6lL468aEUp&Expires=1462787071&use_id=00001&Signature=jprQLI0kGdcvmIvkm5rTx5LFkJ4%3D&device_id=AE9789798BC01'
-
         :param channel_name: 直播频道的名称
         :param expires: 过期时间（单位：秒），链接在当前时间再过expires秒后过期
         :param playlist_name: 播放列表名称，注意与创建live channel时一致
@@ -293,7 +289,7 @@ def sign_rtmp_url(self, channel_name, playlist_name, expires, params=None):
         :return: 签名URL。
         """        
         url = self._make_url(self.bucket_name, 'live').replace('http://', 'rtmp://').replace('https://', 'rtmp://') + '/' + channel_name
-        params = params if params else {}
+        params = {}
         params['playlistName'] = playlist_name
         return self.auth._sign_rtmp_url(url, self.bucket_name, channel_name, playlist_name, expires, params)
 

diff --git a/tests/test_live_channel.py b/tests/test_live_channel.py
@@ -264,12 +264,6 @@ def test_sign_rtmp_url(self):
         expires = 3600
         signed_url = self.bucket.sign_rtmp_url(channel_name, playlist_name, expires)
         self.assertTrue(signed_url.startswith(self._get_publish_url(self.bucket.bucket_name, channel_name)))
-
-        params = {'K1': 'V1', 'K2': 'V2'}
-        signed_url = self.bucket.sign_rtmp_url(channel_name, playlist_name, expires, params)
-        self.assertTrue(signed_url.startswith(self._get_publish_url(self.bucket.bucket_name, channel_name)))
-        self.assertTrue('K1=V1' in signed_url)
-        self.assertTrue('K2=V2' in signed_url)
 
         self.bucket.delete_live_channel(channel_name)