gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-26 20:52:44 +08:00
Code Issues Releases Wiki Activity

Merge branch 'koogua/fix-live' into demo

Browse Source
This commit is contained in:
koogua 2021-06-23 15:47:20 +08:00
commit 4ffa59d989
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Admin/Views/public/live_player.volt
View File

@ -33,13 +33,12 @@
var options = { var options = {
live: true, live: true,
autoplay: true, autoplay: true,
h5_flv: true,
width: 720, width: 720,
height: 405 height: 405
}; };
var playUrls = JSON.parse('{{ pull_urls|json_encode }}'); var playUrls = JSON.parse('{{ pull_urls|json_encode }}');
var formats = ['rtmp', 'flv', 'm3u8']; var formats = ['m3u8'];
var rates = ['od', 'hd', 'sd']; var rates = ['od', 'hd', 'sd'];
$.each(formats, function (i, format) { $.each(formats, function (i, format) {

2
app/Http/Admin/Views/setting/live.volt
View File

@ -76,7 +76,7 @@
type: 2, type: 2,
title: '拉流测试', title: '拉流测试',
resize: false, resize: false,
area: ['720px', '445px'], area: ['720px', '456px'],
content: [url, 'no'] content: [url, 'no']
}); });
}); });

2
public/static/admin/js/media.preview.js
View File

@ -14,7 +14,7 @@ layui.use(['jquery', 'layer'], function () {
type: 2, type: 2,
title: '媒体播放器', title: '媒体播放器',
resize: false, resize: false,
area: ['720px', '445px'], area: ['720px', '456px'],
content: [frameUrl, 'no'] content: [frameUrl, 'no']
}); });