|
@@ -31,12 +31,14 @@ class Live
|
|
|
$data['stream_hls'] = $stream['url_hls'];
|
|
|
$data['stream_hdl'] = $stream['url_hdl'];
|
|
|
$data['stream_pic'] = $stream['url_pic'];
|
|
|
+ $data['url'] = $data['stream_rtmp'];
|
|
|
} elseif (isset($data['stream_link']) && $data['stream_link']) {
|
|
|
$data['stream'] = $data['stream_link'];
|
|
|
$data['stream_rtmp'] = $data['stream_link'];
|
|
|
$data['stream_hls'] = $data['stream_link'];
|
|
|
$data['stream_hdl'] = $data['stream_link'];
|
|
|
$data['stream_pic'] = $data['stream_link'];
|
|
|
+ $data['url'] = $data['stream_rtmp'];
|
|
|
}
|
|
|
|
|
|
$data['status'] = 2;
|
|
@@ -50,7 +52,7 @@ class Live
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if ($data['url']) {
|
|
|
+ if ($data['url'] && !isset($data['stream_rtmp'])) {
|
|
|
$data = Dever::load('video/lib/vod')->avinfo($data, 'url', 'video/live');
|
|
|
}
|
|
|
|