From 49d678730ef63c6d5b6425ac9ffd45cefc56c048 Mon Sep 17 00:00:00 2001
From: xc <double72cheng@gmail.com>
Date: Thu, 22 Apr 2021 18:58:26 +0800
Subject: [PATCH] 组件化开发准备工作
---
src/main/resources/public/js/jessibuca/264_aac_wasm.js | 0
src/main/resources/public/js/jessibuca/hevc_aac.html | 0
src/main/resources/public/monitor/history.html | 2
src/main/resources/public/js/jessibuca/264_mp3_wasm.js | 0
src/main/resources/public/js/jessibuca/cocos.js | 0
src/main/resources/public/js/jessibuca/264_mp3.js | 0
src/main/resources/public/js/jessibuca/ff_aac.html | 0
src/main/resources/public/monitor/live.html | 37 +-----------
src/main/resources/public/js/jessibuca/libde265_aac.js | 0
src/main/resources/public/js/jessibuca/ff_aac_wasm.wasm | 0
src/main/resources/public/js/jessibuca/ff_mp3.js | 0
src/main/resources/public/js/jessibuca/264_aac_wasm.wasm | 0
src/main/resources/public/js/jessibuca/hevc_aac.js | 0
src/main/resources/public/js/jessibuca/ff_mp3_wasm.js | 0
src/main/resources/public/js/jessibuca/ff_mp3 16.53.27.html | 0
src/main/resources/public/js/jessibuca/ff.js | 0
src/main/resources/public/js/jessibuca/ff_mp3 17.19.30.html | 0
src/main/resources/public/js/jessibuca/flash.html | 0
src/main/resources/public/js/jessibuca/264_mp3_wasm.wasm | 0
src/main/resources/public/js/jessibuca/ff.wasm | 0
src/main/resources/public/js/jessibuca/hevc.js | 0
src/main/resources/public/js/jessibuca/hevc_mp3.js | 0
src/main/resources/public/js/jessibuca/ff_wasm.wasm | 0
src/main/resources/public/js/jessibuca/ff_aac 16.53.27.html | 0
src/main/resources/public/js/jessibuca/ff_aac.js | 0
src/main/resources/public/css/controles.css | 8 ++
src/main/resources/public/js/live/livepler.js | 96 ++++++++++++++++++++++++++++++++
src/main/resources/public/js/jessibuca/264_aac.js | 0
src/main/resources/public/js/jessibuca/avc.js | 0
src/main/resources/public/js/jessibuca/ff_mp3.html | 0
src/main/resources/public/js/jessibuca/ff_mp3_wasm.wasm | 0
src/main/resources/public/js/jessibuca/ff_wasm.js | 0
src/main/resources/public/js/jessibuca/libde265_mp3.js | 0
src/main/resources/public/js/jessibuca/live_test.swf | 0
src/main/resources/public/js/jessibuca/ff_aac_wasm.js | 0
src/main/resources/public/js/jessibuca/ff_aac 17.19.30.html | 0
36 files changed, 108 insertions(+), 35 deletions(-)
diff --git a/src/main/resources/public/css/controles.css b/src/main/resources/public/css/controles.css
index 46b16e1..7592502 100644
--- a/src/main/resources/public/css/controles.css
+++ b/src/main/resources/public/css/controles.css
@@ -19,6 +19,14 @@
}
+.player-wrapper {
+ width: 900px;
+ height: 500px;
+ /*overflow-y: auto;*/
+ margin: 0 auto;
+ text-align: center;
+}
+
.player .control{
position: absolute;
background: rgba(255, 255, 255, 0.3);
diff --git a/src/main/resources/public/js/timeline/264_aac.js b/src/main/resources/public/js/jessibuca/264_aac.js
similarity index 100%
rename from src/main/resources/public/js/timeline/264_aac.js
rename to src/main/resources/public/js/jessibuca/264_aac.js
diff --git a/src/main/resources/public/js/timeline/264_aac_wasm.js b/src/main/resources/public/js/jessibuca/264_aac_wasm.js
similarity index 100%
rename from src/main/resources/public/js/timeline/264_aac_wasm.js
rename to src/main/resources/public/js/jessibuca/264_aac_wasm.js
diff --git a/src/main/resources/public/js/timeline/264_aac_wasm.wasm b/src/main/resources/public/js/jessibuca/264_aac_wasm.wasm
similarity index 100%
rename from src/main/resources/public/js/timeline/264_aac_wasm.wasm
rename to src/main/resources/public/js/jessibuca/264_aac_wasm.wasm
Binary files differ
diff --git a/src/main/resources/public/js/timeline/264_mp3.js b/src/main/resources/public/js/jessibuca/264_mp3.js
similarity index 100%
rename from src/main/resources/public/js/timeline/264_mp3.js
rename to src/main/resources/public/js/jessibuca/264_mp3.js
diff --git a/src/main/resources/public/js/timeline/264_mp3_wasm.js b/src/main/resources/public/js/jessibuca/264_mp3_wasm.js
similarity index 100%
rename from src/main/resources/public/js/timeline/264_mp3_wasm.js
rename to src/main/resources/public/js/jessibuca/264_mp3_wasm.js
diff --git a/src/main/resources/public/js/timeline/264_mp3_wasm.wasm b/src/main/resources/public/js/jessibuca/264_mp3_wasm.wasm
similarity index 100%
rename from src/main/resources/public/js/timeline/264_mp3_wasm.wasm
rename to src/main/resources/public/js/jessibuca/264_mp3_wasm.wasm
Binary files differ
diff --git a/src/main/resources/public/js/timeline/avc.js b/src/main/resources/public/js/jessibuca/avc.js
similarity index 100%
rename from src/main/resources/public/js/timeline/avc.js
rename to src/main/resources/public/js/jessibuca/avc.js
diff --git a/src/main/resources/public/js/timeline/cocos.js b/src/main/resources/public/js/jessibuca/cocos.js
similarity index 100%
rename from src/main/resources/public/js/timeline/cocos.js
rename to src/main/resources/public/js/jessibuca/cocos.js
diff --git a/src/main/resources/public/js/timeline/ff.js b/src/main/resources/public/js/jessibuca/ff.js
similarity index 100%
rename from src/main/resources/public/js/timeline/ff.js
rename to src/main/resources/public/js/jessibuca/ff.js
diff --git a/src/main/resources/public/js/timeline/ff.wasm b/src/main/resources/public/js/jessibuca/ff.wasm
similarity index 100%
rename from src/main/resources/public/js/timeline/ff.wasm
rename to src/main/resources/public/js/jessibuca/ff.wasm
Binary files differ
diff --git a/src/main/resources/public/js/timeline/ff_aac 16.53.27.html b/src/main/resources/public/js/jessibuca/ff_aac 16.53.27.html
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_aac 16.53.27.html
rename to src/main/resources/public/js/jessibuca/ff_aac 16.53.27.html
diff --git a/src/main/resources/public/js/timeline/ff_aac 17.19.30.html b/src/main/resources/public/js/jessibuca/ff_aac 17.19.30.html
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_aac 17.19.30.html
rename to src/main/resources/public/js/jessibuca/ff_aac 17.19.30.html
diff --git a/src/main/resources/public/js/timeline/ff_aac.html b/src/main/resources/public/js/jessibuca/ff_aac.html
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_aac.html
rename to src/main/resources/public/js/jessibuca/ff_aac.html
diff --git a/src/main/resources/public/js/timeline/ff_aac.js b/src/main/resources/public/js/jessibuca/ff_aac.js
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_aac.js
rename to src/main/resources/public/js/jessibuca/ff_aac.js
diff --git a/src/main/resources/public/js/timeline/ff_aac_wasm.js b/src/main/resources/public/js/jessibuca/ff_aac_wasm.js
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_aac_wasm.js
rename to src/main/resources/public/js/jessibuca/ff_aac_wasm.js
diff --git a/src/main/resources/public/js/timeline/ff_aac_wasm.wasm b/src/main/resources/public/js/jessibuca/ff_aac_wasm.wasm
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_aac_wasm.wasm
rename to src/main/resources/public/js/jessibuca/ff_aac_wasm.wasm
Binary files differ
diff --git a/src/main/resources/public/js/timeline/ff_mp3 16.53.27.html b/src/main/resources/public/js/jessibuca/ff_mp3 16.53.27.html
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_mp3 16.53.27.html
rename to src/main/resources/public/js/jessibuca/ff_mp3 16.53.27.html
diff --git a/src/main/resources/public/js/timeline/ff_mp3 17.19.30.html b/src/main/resources/public/js/jessibuca/ff_mp3 17.19.30.html
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_mp3 17.19.30.html
rename to src/main/resources/public/js/jessibuca/ff_mp3 17.19.30.html
diff --git a/src/main/resources/public/js/timeline/ff_mp3.html b/src/main/resources/public/js/jessibuca/ff_mp3.html
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_mp3.html
rename to src/main/resources/public/js/jessibuca/ff_mp3.html
diff --git a/src/main/resources/public/js/timeline/ff_mp3.js b/src/main/resources/public/js/jessibuca/ff_mp3.js
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_mp3.js
rename to src/main/resources/public/js/jessibuca/ff_mp3.js
diff --git a/src/main/resources/public/js/timeline/ff_mp3_wasm.js b/src/main/resources/public/js/jessibuca/ff_mp3_wasm.js
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_mp3_wasm.js
rename to src/main/resources/public/js/jessibuca/ff_mp3_wasm.js
diff --git a/src/main/resources/public/js/timeline/ff_mp3_wasm.wasm b/src/main/resources/public/js/jessibuca/ff_mp3_wasm.wasm
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_mp3_wasm.wasm
rename to src/main/resources/public/js/jessibuca/ff_mp3_wasm.wasm
Binary files differ
diff --git a/src/main/resources/public/js/timeline/ff_wasm.js b/src/main/resources/public/js/jessibuca/ff_wasm.js
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_wasm.js
rename to src/main/resources/public/js/jessibuca/ff_wasm.js
diff --git a/src/main/resources/public/js/timeline/ff_wasm.wasm b/src/main/resources/public/js/jessibuca/ff_wasm.wasm
similarity index 100%
rename from src/main/resources/public/js/timeline/ff_wasm.wasm
rename to src/main/resources/public/js/jessibuca/ff_wasm.wasm
Binary files differ
diff --git a/src/main/resources/public/js/timeline/flash.html b/src/main/resources/public/js/jessibuca/flash.html
similarity index 100%
rename from src/main/resources/public/js/timeline/flash.html
rename to src/main/resources/public/js/jessibuca/flash.html
diff --git a/src/main/resources/public/js/timeline/hevc.js b/src/main/resources/public/js/jessibuca/hevc.js
similarity index 100%
rename from src/main/resources/public/js/timeline/hevc.js
rename to src/main/resources/public/js/jessibuca/hevc.js
diff --git a/src/main/resources/public/js/timeline/hevc_aac.html b/src/main/resources/public/js/jessibuca/hevc_aac.html
similarity index 100%
rename from src/main/resources/public/js/timeline/hevc_aac.html
rename to src/main/resources/public/js/jessibuca/hevc_aac.html
diff --git a/src/main/resources/public/js/timeline/hevc_aac.js b/src/main/resources/public/js/jessibuca/hevc_aac.js
similarity index 100%
rename from src/main/resources/public/js/timeline/hevc_aac.js
rename to src/main/resources/public/js/jessibuca/hevc_aac.js
diff --git a/src/main/resources/public/js/timeline/hevc_mp3.js b/src/main/resources/public/js/jessibuca/hevc_mp3.js
similarity index 100%
rename from src/main/resources/public/js/timeline/hevc_mp3.js
rename to src/main/resources/public/js/jessibuca/hevc_mp3.js
diff --git a/src/main/resources/public/js/timeline/libde265_aac.js b/src/main/resources/public/js/jessibuca/libde265_aac.js
similarity index 100%
rename from src/main/resources/public/js/timeline/libde265_aac.js
rename to src/main/resources/public/js/jessibuca/libde265_aac.js
diff --git a/src/main/resources/public/js/timeline/libde265_mp3.js b/src/main/resources/public/js/jessibuca/libde265_mp3.js
similarity index 100%
rename from src/main/resources/public/js/timeline/libde265_mp3.js
rename to src/main/resources/public/js/jessibuca/libde265_mp3.js
diff --git a/src/main/resources/public/js/timeline/live_test.swf b/src/main/resources/public/js/jessibuca/live_test.swf
similarity index 100%
rename from src/main/resources/public/js/timeline/live_test.swf
rename to src/main/resources/public/js/jessibuca/live_test.swf
Binary files differ
diff --git a/src/main/resources/public/js/live/livepler.js b/src/main/resources/public/js/live/livepler.js
new file mode 100755
index 0000000..cfa787c
--- /dev/null
+++ b/src/main/resources/public/js/live/livepler.js
@@ -0,0 +1,96 @@
+!(function () {
+
+
+ window.onkeydown = function () {
+ h5lc.fullscreen = false
+ }
+ var $toolbar = document.getElementById('toolbar');
+ var $fullscreenId = document.getElementById('fullscreenId');
+
+ var $play = document.getElementById('play');
+ var $stop = document.getElementById('stop');
+ var container = document.getElementById("container");
+
+ var isPlaying = false;
+ let source = queryParam('source') || 'localhost';
+
+ var h5lc = new Jessibuca({container, decoder: "../js/jessibuca/ff.js", videoBuffer: 1});
+
+ h5lc.onLoad = function () {
+ //this.play("wss://pulls.1234326.cn/live/L01.flv")
+ //this.play("ws://localhost:8080/live/test.flv")
+ //this.play("ws://" + source + ":8080/live/" + stream)
+ //this.play("ws://pull3.afb1188.com/live/" + stream + ".flv")
+ //this.play("ws://pull2.afb1188.com/live/" + stream + ".flv")
+ }
+
+ //自动加载播放
+ h5lc.onPlay = function () {
+ isPlaying = true;
+ $play.style.display = 'none';
+ $stop.style.display = 'inline';
+ }
+
+ //点击播放按钮播放
+ $play.addEventListener('click', function () {
+ isPlaying = true;
+ h5lc.play("ws://172.16.30.113:8082/live/ff80808178af424e0178af44e677000343616d657261.flv")
+ $play.style.display = 'none';
+ $stop.style.display = 'inline';
+ }, false);
+
+ //点击播放停止
+ $stop.addEventListener('click', function () {
+ isPlaying = false;
+ //stop();
+ $play.style.display = 'inline';
+ $stop.style.display = 'none';
+ }, false);
+
+ function stop() {
+ $.get("http://127.0.0.1:8088/monica/video/stop?param=live/test", function () {
+ h5lc.close()
+ }
+ );
+ }
+
+ function queryParam(name, url) {
+ var search = window.location.search;
+ var qArr = '';
+ var key = {};
+ if (url) {
+ qArr = url.split("?")[1].split("&")
+ } else {
+ if (!window.location.search) {
+ return
+ }
+ qArr = search.substr(1).split("&")
+ }
+ for (var i = 0; i < qArr.length; i++) {
+
+ var firstPos = qArr[i].indexOf('=');
+ key[qArr[i].slice(0, firstPos)] = qArr[i].slice(firstPos + 1)
+ }
+ if (name) {
+ return key[name]
+ } else {
+ if (url) {
+ return key[name]
+ } else {
+ return key
+ }
+ }
+ }
+
+ //工具栏 鼠标定位隐藏
+ $toolbar.onmouseover(function () {
+ $(".player .control").css("display", "block")
+ })
+ $toolbar.onmouseout(function () {
+ $(".player .control").css("display", "none")
+ })
+ $fullscreenId.onclick(function () {
+ h5lc.fullscreen=true
+ })
+
+})();
diff --git a/src/main/resources/public/monitor/history.html b/src/main/resources/public/monitor/history.html
index ebf50ab..8fc4630 100755
--- a/src/main/resources/public/monitor/history.html
+++ b/src/main/resources/public/monitor/history.html
@@ -46,7 +46,7 @@
var container = document.getElementById("container");
let decoder = queryParam('decoder') || 'ff';
- var h5lc = new Jessibuca({container, decoder: "../js/timeline/ff.js", videoBuffer: 0});
+ var h5lc = new Jessibuca({container, decoder: "../js/jessibuca/ff.js", videoBuffer: 0});
$("#progressTime").ProgressTime({
diff --git a/src/main/resources/public/monitor/live.html b/src/main/resources/public/monitor/live.html
index 6e4ebc4..a7a964c 100755
--- a/src/main/resources/public/monitor/live.html
+++ b/src/main/resources/public/monitor/live.html
@@ -8,21 +8,6 @@
<link rel="stylesheet" href="../css/font-awesome.min.css">
<link rel="stylesheet" href="../css/controles.css">
- <style>
- .player-wrapper {
- width: 900px;
- height: 500px;
- /*overflow-y: auto;*/
- margin: 0 auto;
- text-align: center;
- }
-
- /* .player-wrapper canvas {
- width: 100%;
- height: 100%;
- }*/
-
- </style>
</head>
<body>
@@ -56,15 +41,10 @@
<script src="../js/ajax.js"></script>
<script src="../js/renderer.js"></script>
-<script type="text/javascript" src="../js/jquery.min.js"></script>
+<script src="../js/jquery.min.js"></script>
<script>
- var hourTimestamp = 3600 * 1000;
- var dayTimestamp = hourTimestamp * 24;
- var currentTimer;
-
-
window.onkeydown = function () {
h5lc.fullscreen = false
}
@@ -77,7 +57,7 @@
var isPlaying = false;
let source = queryParam('source') || 'localhost';
- var h5lc = new Jessibuca({container, decoder: "../js/timeline/ff.js", videoBuffer: 0});
+ var h5lc = new Jessibuca({container, decoder: "../js/jessibuca/ff.js", videoBuffer: 0});
h5lc.onLoad = function () {
//this.play("wss://pulls.1234326.cn/live/L01.flv")
@@ -92,14 +72,7 @@
$stop.style.display = 'inline';
}
$play.addEventListener('click', function () {
- if (isPlaying) {
- return;
- }
isPlaying = true;
- /* $.get("http://127.0.0.1:8088/monica/test/video", function (data) {
- h5lc.play(data)
- }
- );*/
h5lc.play("ws://172.16.30.113:8082/live/ff80808178af424e0178af44e677000343616d657261.flv")
$play.style.display = 'none';
$stop.style.display = 'inline';
@@ -152,11 +125,7 @@
}
function playerShow() {
- if (isLive) {
- $(".player .control").css("display", "block")
- } else {
- $(".player .control").css("display", "none")
- }
+ $(".player .control").css("display", "block")
}
function playerHidden() {
--
Gitblit v1.9.1