修复ui开启音频无法播放的bug

修复可能导致录象查看的bug 修复开启openRTPServer时的bug

修复ui开启音频无法播放的bug
修复可能导致录象查看的bug 修复开启openRTPServer时的bug
648540858
1 parent 04af6de3
Showing 9 changed files with 63 additions and 49 deletions
README.md
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMUtils.java
src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java
src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
web_src/src/components/channelList.vue
web_src/src/components/gb28181/devicePlayer.vue
 # wvp
 WEB VIDEO PLATFORM譏ｯ荳荳ｪ蝓ｺ莠雑B28181-2016譬螳樒鴫逧ｽ醍ｻ懆ｧ｢大ｹｳ蜿ｰ瑚ｴ溯ｴ｣螳樒鴫譬ｸ蠢ｿ｡莉､荳手ｮｾ螟ｮ｡逅錘蜿ｰ驛ｨ蛻ｼ梧髪謖¨AT遨ｿ騾擾ｼ梧髪謖∵ｵｷ蠎ｷ縲∝､ｧ蜊弱∝ｮｧｭ牙刀迚檎噪IPC縲¨VR縲．VR謗･蜈･縲   
-豬∝ｪ剃ｽ捺恪蜉｡蝓ｺ莠算LMediaKit-https://github.com/xiongziliang/ZLMediaKit
+豬∝ｪ剃ｽ捺恪蜉｡蝓ｺ莠算LMediaKit-https://github.com/xiongziliang/ZLMediaKit  
 蜑肴ｮｵ鬘ｵ髱｢蝓ｺ莠皿ediaServerUI霑幄｡御ｿｮ謾ｹ.
 # 蠎皮畑蝨ｺ譎ｯ
@@ -16,24 +16,25 @@ WEB VIDEO PLATFORM譏ｯ荳荳ｪ蝓ｺ莠雑B28181-2016譬螳樒鴫逧ｽ醍ｻ懆ｧ｢大ｹｳ蜿ｰ
 ![build_1.png](https://github.com/648540858/wiki/blob/master/images/Screenshot_20201012_151606.png)
 # 蜴溽沿迚ｹ諤ｧ
-1. 隗｢鷹｢ｧ  
-2. 莠大床謗ｧ蛻ｶ域婿蜷代∫ｼｩ謾ｾ謗ｧ蛻ｶ  
-3. 隗｢題ｮｾ螟ｿ｡諱ｯ蜷梧ｭ･   
-4. 遖ｻ蝨ｨ郤ｿ逶第而  
-5. 蠖募ワ譟･隸｢荳主屓謾ｾ亥渕莠晒VR\DVR梧嘯荳肴髪謖∝ｿｫ霑帙《eek謫堺ｽ懶ｼ  
-6. 譌莠ｺ隗ら恚閾ｪ蜉ｨ譁ｭ豬    
-
-
-# 譁ｰ謾ｯ謖∫音諤ｧ
-1. 髮web逡碁擇, 荳埼怙隕∝黒迢ｬ驛ｨ鄂ｲ蜑咲ｫｯ譛榊苅, 逶ｴ謗･蛻ｩ逕ｨwvp蜀ｽｮ譁ｻｶ譛榊苅驛ｨ鄂ｲ. 
-2. 謾ｯ謖∝ｹｳ蜿ｰ謗･蜈･, 髓亥ｯｹ螟ｧ蟷ｳ蜿ｰ螟ｧ驥剰ｮｾ螟噪諠霑幄｡御ｼ伜喧.
-3. 謾ｯ謖∵｣邏｢,騾夐％遲幃.
-4. 謾ｯ謖∬蜉ｨ驟咲ｽｮZLM蟐剃ｽ捺恪蜉｡, 蜃丞ｰ大屏驟咲ｽｮ髣ｮ鬚俶園蜃ｺ邇ｰ逧琉鬚.
-5. 謾ｯ謖∝星逕ｨudp螟夂ｫｯ蜿｣讓｡蠑, 謠宣ｫdp讓｡蠑丈ｸ句ｪ剃ｽ謎ｼ霎捺ｧ閭ｽ.
-6. 謾ｯ謖夐％譏ｯ蜷ｦ蜷ｫ譛蛾浹鬚醍噪隶ｾ鄂ｮ
-7. 謾ｯ謖夐％蟄千岼蠖墓衍隸｢
-8. 謾ｯ謖「dp/tcp,荳､遘肴ｨ｡蠑丈ｼ霎楢ｧ｢第ｵ  
-
+1. 隗｢鷹｢ｧ;  
+2. 莠大床謗ｧ蛻ｶ域婿蜷代∫ｼｩ謾ｾ謗ｧ蛻ｶ;  
+3. 隗｢題ｮｾ螟ｿ｡諱ｯ蜷梧ｭ･;   
+4. 遖ｻ蝨ｨ郤ｿ逶第而;  
+5. 蠖募ワ譟･隸｢荳主屓謾ｾ亥渕莠晒VR\DVR梧嘯荳肴髪謖∝ｿｫ霑帙《eek謫堺ｽ懶ｼ;  
+6. 譌莠ｺ隗ら恚閾ｪ蜉ｨ譁ｭ豬;    
+7. 謾ｯ謖ゞDP蜥卦CP荳､遘榊嵜譬ｿ｡莉､莨霎捺ｨ｡蠑;  
+
+# 譁ｰ謾ｯ謖∫音諤ｧ  
+1. 髮web逡碁擇, 荳埼怙隕∝黒迢ｬ驛ｨ鄂ｲ蜑咲ｫｯ譛榊苅, 逶ｴ謗･蛻ｩ逕ｨwvp蜀ｽｮ譁ｻｶ譛榊苅驛ｨ鄂ｲ, 髫舜vp荳襍ｷ驛ｨ鄂ｲ;   
+2. 謾ｯ謖∝ｹｳ蜿ｰ謗･蜈･, 髓亥ｯｹ螟ｧ蟷ｳ蜿ｰ螟ｧ驥剰ｮｾ螟噪諠霑幄｡御ｼ伜喧;  
+3. 謾ｯ謖∵｣邏｢,騾夐％遲幃;  
+4. 謾ｯ謖∬蜉ｨ驟咲ｽｮZLM蟐剃ｽ捺恪蜉｡, 蜃丞ｰ大屏驟咲ｽｮ髣ｮ鬚俶園蜃ｺ邇ｰ逧琉鬚;  
+5. 謾ｯ謖∝星逕ｨudp螟夂ｫｯ蜿｣讓｡蠑, 謠宣ｫdp讓｡蠑丈ｸ句ｪ剃ｽ謎ｼ霎捺ｧ閭ｽ;  
+6. 謾ｯ謖夐％譏ｯ蜷ｦ蜷ｫ譛蛾浹鬚醍噪隶ｾ鄂ｮ;  
+7. 謾ｯ謖夐％蟄千岼蠖墓衍隸｢;  
+8. 謾ｯ謖「dp/tcp蝗ｽ譬ｵ∽ｼ霎捺ｨ｡蠑;  
+9. 謾ｯ謖∫峩謗･霎灘RTSP縲ヽTMP縲？TTP-FLV縲仝ebsocket-FLV縲？LS螟夂ｧ榊刻隶ｮ豬∝慍蝮  
+10. 
 # 蠕ｮ樒鴫 
 荳顔ｺｧ郤ｧ閨  
 謗ｨ豬∝陦ｨ  
@@ -538,7 +538,7 @@ public class SIPCommander implements ISIPCommander {
 			recordInfoXml.append("<DeviceID>" + channelId + "</DeviceID>\r\n");
 			recordInfoXml.append("<StartTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(startTime) + "</StartTime>\r\n");
 			recordInfoXml.append("<EndTime>" + DateUtil.yyyy_MM_dd_HH_mm_ssToISO8601(endTime) + "</EndTime>\r\n");
-			recordInfoXml.append("<Secrecy>0</Secrecy>\\r\n");
+			recordInfoXml.append("<Secrecy>0</Secrecy>\r\n");
 			// 大华NVR要求必须增加一个值为all的文本元素节点Type
 			recordInfoXml.append("<Type>all</Type>\r\n");
 			recordInfoXml.append("</Query>\r\n");
@@ -140,8 +140,6 @@ public class ZLMHttpHookListener {
 			streamInfo.setRtmp(String.format("rtmp://%s:%s/rtp/%s", mediaInfo.getLocalIP(), mediaInfo.getRtmpPort(), streamId));
 			streamInfo.setHls(String.format("http://%s:%s/rtp/%s/hls.m3u8", mediaInfo.getLocalIP(), mediaInfo.getHttpPort(), streamId));
 			streamInfo.setRtsp(String.format("rtsp://%s:%s/rtp/%s", mediaInfo.getLocalIP(), mediaInfo.getRtspPort(), streamId));
-
-
 			storager.startPlay(streamInfo);
 		}
@@ -74,6 +74,15 @@ public class ZLMRESTfulUtils {
         return sendPost("getMediaList",param);
     }
+    public JSONObject getMediaInfo(String app, String schema, String stream){
+        Map<String, Object> param = new HashMap<>();
+        param.put("app",app);
+        param.put("schema",schema);
+        param.put("stream",stream);
+        param.put("vhost","__defaultVhost__");
+        return sendPost("getMediaInfo",param);
+    }
+
     public JSONObject getRtpInfo(String stream_id){
         Map<String, Object> param = new HashMap<>();
         param.put("stream_id",stream_id);
@@ -37,7 +37,7 @@ public class ZLMUtils {
             System.out.println(jsonObject.toJSONString());
             return newPort;
         }else {
-            return getNewRTPPort(streamId);
+            return getNewRTPPort(ssrc);
         }
     }
@@ -165,7 +165,7 @@ public class VideoManagerJdbcStoragerImpl implements IVideoManagerStorager {
 	@Override
 	public void updateCatch() {
-
+		System.out.println("##################");
 	}
 	@Override
@@ -64,18 +64,25 @@ public class PlayController {
 		while (lockFlag) {
 			try {
-
 				if (System.currentTimeMillis() - startTime > 15 * 1000) {
 					storager.stopPlay(streamInfo);
 					return new ResponseEntity<String>("timeout",HttpStatus.OK);
 				}else {
+					streamInfo = storager.queryPlayByDevice(deviceId, channelId);
 					JSONObject rtpInfo = zlmresTfulUtils.getRtpInfo(streamId);
-					if (rtpInfo == null || !rtpInfo.getBoolean("exist") || storager.queryPlayByDevice(deviceId, channelId).getFlv() == null){
+					if (rtpInfo != null && rtpInfo.getBoolean("exist") && streamInfo.getFlv() != null){
+						JSONObject mediaInfo = zlmresTfulUtils.getMediaInfo("rtp", "rtmp", streamId);
+						if (mediaInfo.getInteger("code") == 0 && mediaInfo.getBoolean("online")) {
+							lockFlag = false;
+							JSONArray tracks = mediaInfo.getJSONArray("tracks");
+							streamInfo.setTracks(tracks);
+							storager.startPlay(streamInfo);
+						}else {
+
+						}
+					}else {
 						Thread.sleep(2000);
 						continue;
-					}else {
-						lockFlag = false;
-						streamInfo = storager.queryPlay(streamInfo);
 					};
 				}
 			} catch (InterruptedException e) {
@@ -54,12 +54,15 @@
           </el-table-column>
             <el-table-column prop="ptztypeText" label="云台类型">
             </el-table-column>
-						<el-table-column label="操作" width="240" align="center" fixed="right">
+						<el-table-column label="操作" width="280" align="center" fixed="right">
 							<template slot-scope="scope">
-								<el-button size="mini" icon="el-icon-video-play" v-if="scope.row.parental == 0" @click="sendDevicePush(scope.row)">播放</el-button>
-								<el-button size="mini" icon="el-icon-switch-button" type="danger" v-if="scope.row.play" @click="stopDevicePush(scope.row)">停止</el-button>
-								<el-button size="mini" icon="el-icon-s-open"  type="primary" v-if="scope.row.parental == 1" @click="changeSubchannel(scope.row)">查看子目录</el-button>
-								<!-- <el-button size="mini" @click="sendDevicePush(scope.row)">录像查询</el-button> -->
+                <el-button-group>
+                  <el-button size="mini" icon="el-icon-video-play" v-if="scope.row.parental == 0" @click="sendDevicePush(scope.row)">播放</el-button>
+                  <el-button size="mini" icon="el-icon-switch-button" type="danger" v-if="scope.row.play" @click="stopDevicePush(scope.row)">停止</el-button>
+                  <el-button size="mini" icon="el-icon-s-open"  type="primary" v-if="scope.row.parental == 1" @click="changeSubchannel(scope.row)">查看</el-button>
+<!--                  <el-button size="mini" icon="el-icon-video-camera" type="primary" >设备录象</el-button>-->
+                  <!-- <el-button size="mini" @click="sendDevicePush(scope.row)">录像查询</el-button> -->
+                </el-button-group>
 							</template>
 						</el-table-column>
 				</el-table>
 <template>
 	<div id="devicePlayer">
 		<el-dialog title="视频播放" top="0" :visible.sync="showVideoDialog" :destroy-on-close="true" @close="close()">
-      <LivePlayer v-if="showVideoDialog && hasaudio" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" hasaudio fluent autoplay live ></LivePlayer>
-      <LivePlayer v-if="showVideoDialog && !hasaudio" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" fluent autoplay live ></LivePlayer>
+      <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" :hasaudio="hasaudio" fluent autoplay live ></LivePlayer>
 			<div id="shared" style="text-align: right; margin-top: 1rem;">
 				<el-tabs v-model="tabActiveName">
 					<el-tab-pane label="媒体流信息" name="media">
@@ -123,20 +122,17 @@
 		methods: {
 			play: function(streamInfo, deviceId, channelId, hasAudio) {
-        // this.hasaudio = hasAudio;
-        if (!hasAudio) { // hasaudio == false时设置播放器hasaudio false, 否则不设置
-          this.hasaudio = hasAudio;
-        }
+        this.hasaudio = hasAudio;
         // 根据媒体流信息二次判断
-        // if( this.hasaudio && !!streamInfo.tracks && streamInfo.tracks.length > 0) {
-        //   var realHasAudio = false;
-        //   for (let i = 0; i < streamInfo.tracks; i++) {
-        //     if (streamInfo.tracks[i].codec_type == 1) { // 判断为音频
-        //       realHasAudio = true;
-        //     }
-        //   }
-        //   this.hasaudio = realHasAudio && this.hasaudio;
-        // }
+        if( this.hasaudio && !!streamInfo.tracks && streamInfo.tracks.length > 0) {
+          var realHasAudio = false;
+          for (let i = 0; i < streamInfo.tracks; i++) {
+            if (streamInfo.tracks[i].codec_type == 1) { // 判断为音频
+              realHasAudio = true;
+            }
+          }
+          this.hasaudio = realHasAudio && this.hasaudio;
+        }
         this.ssrc = streamInfo.ssrc;
 				this.deviceId = deviceId;
 				this.channelId = channelId;