XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加获取直播流的api

Browse Source
This commit is contained in:
panlinlin
2021-03-26 18:32:36 +08:00
parent 9a4b0de1af
commit edb033ccd7
14 changed files with 1039 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
View File

@@ -51,8 +51,8 @@ public class ZLMHttpHookListener {
@Autowired
private IRedisCatchStorage redisCatchStorage;
// @Autowired
// private ZLMRESTfulUtils zlmresTfulUtils;
@Autowired
private ZLMMediaListManager zlmMediaListManager;
@Autowired
private ZLMHttpHookSubscribe subscribe;
@@ -237,6 +237,7 @@ public class ZLMHttpHookListener {
// 流消失移除redis play
String app = json.getString("app");
String streamId = json.getString("stream");
String schema = json.getString("schema");
boolean regist = json.getBoolean("regist");
StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
if ("rtp".equals(app) && !regist ) {
@@ -247,6 +248,10 @@ public class ZLMHttpHookListener {
streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId);
redisCatchStorage.stopPlayback(streamInfo);
}
}else {
if (!"rtp".equals(app) && "rtsp".equals(schema)){
zlmMediaListManager.updateMediaList();
}
}
JSONObject ret = new JSONObject();
ret.put("code", 0);

87
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java Normal file
View File

@@ -0,0 +1,87 @@
package com.genersoft.iot.vmp.media.zlm;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.genersoft.iot.vmp.common.RealVideo;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
import com.genersoft.iot.vmp.gb28181.session.SsrcUtil;
import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.impl.RedisCatchStorageImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import java.util.*;
@Component
public class ZLMMediaListManager {
private Logger logger = LoggerFactory.getLogger("ZLMMediaListManager");
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
@Autowired
private IRedisCatchStorage redisCatchStorage;
public void updateMediaList() {
JSONObject mediaList = zlmresTfulUtils.getMediaList();
String dataStr = mediaList.getString("data");
Integer code = mediaList.getInteger("code");
Map<String, RealVideo> result = new HashMap<>();
if (code == 0 ) {
if (dataStr != null) {
List<MediaItem> mediaItems = JSON.parseObject(dataStr, new TypeReference<List<MediaItem>>() {});
for (MediaItem item : mediaItems) {
if ("rtp".equals(item.getApp())) {
continue;
}
String key = item.getApp() + "_" + item.getStream();
RealVideo realVideo = result.get(key);
if (realVideo == null) {
realVideo = new RealVideo();
realVideo.setApp(item.getApp());
realVideo.setStream(item.getStream());
realVideo.setAliveSecond(item.getAliveSecond());
realVideo.setCreateStamp(item.getCreateStamp());
realVideo.setOriginSock(item.getOriginSock());
realVideo.setTotalReaderCount(item.getTotalReaderCount());
realVideo.setOriginType(item.getOriginType());
realVideo.setOriginTypeStr(item.getOriginTypeStr());
realVideo.setOriginUrl(item.getOriginUrl());
realVideo.setCreateStamp(item.getCreateStamp());
realVideo.setAliveSecond(item.getAliveSecond());
ArrayList<RealVideo.MediaSchema> mediaSchemas = new ArrayList<>();
realVideo.setSchemas(mediaSchemas);
realVideo.setTracks(item.getTracks());
realVideo.setVhost(item.getVhost());
result.put(key, realVideo);
}
RealVideo.MediaSchema mediaSchema = new RealVideo.MediaSchema();
mediaSchema.setSchema(item.getSchema());
mediaSchema.setBytesSpeed(item.getBytesSpeed());
realVideo.getSchemas().add(mediaSchema);
}
}
}else {
logger.warn("更新视频流失败，错误code： " + code);
}
List<RealVideo> realVideos = new ArrayList<>(result.values());
Collections.sort(realVideos);
redisCatchStorage.updateMediaList(realVideos);
}
}

4
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
View File

@@ -73,6 +73,10 @@ public class ZLMRESTfulUtils {
return sendPost("getMediaList",param);
}
public JSONObject getMediaList(){
return sendPost("getMediaList",null);
}
public JSONObject getMediaInfo(String app, String schema, String stream){
Map<String, Object> param = new HashMap<>();
param.put("app",app);

6
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
View File

@@ -60,6 +60,9 @@ public class ZLMRunner implements CommandLineRunner {
@Autowired
private ZLMRESTfulUtils zlmresTfulUtils;
@Autowired
private ZLMMediaListManager zlmMediaListManager;
@Override
public void run(String... strings) throws Exception {
// 获取zlm信息
@@ -70,6 +73,8 @@ public class ZLMRunner implements CommandLineRunner {
if (autoConfig) saveZLMConfig();
mediaServerConfig = getMediaServerConfig();
redisCatchStorage.updateMediaInfo(mediaServerConfig);
// 更新流列表
zlmMediaListManager.updateMediaList();
}
}
@@ -130,4 +135,5 @@ public class ZLMRunner implements CommandLineRunner {
logger.info("设置zlm失败: " + responseJSON.getString("msg"));
}
}
}

369
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaItem.java Normal file
View File

@@ -0,0 +1,369 @@
package com.genersoft.iot.vmp.media.zlm.dto;
import com.alibaba.fastjson.JSONObject;
import java.util.List;
public class MediaItem {
/**
* 应用名
*/
private String app;
/**
* 流id
*/
private String stream;
/**
* 观看总人数，包括hls/rtsp/rtmp/http-flv/ws-flv
*/
private String totalReaderCount;
/**
* 协议 包括hls/rtsp/rtmp/http-flv/ws-flv
*/
private String schema;
/**
* 产生源类型，
* unknown = 0,
* rtmp_push=1,
* rtsp_push=2,
* rtp_push=3,
* pull=4,
* ffmpeg_pull=5,
* mp4_vod=6,
* device_chn=7
*/
private int originType;
/**
* 客户端和服务器网络信息，可能为null类型
*/
private OriginSock originSock;
/**
* 产生源类型的字符串描述
*/
private String originTypeStr;
/**
* 产生源的url
*/
private String originUrl;
/**
* GMT unix系统时间戳，单位秒
*/
private Long createStamp;
/**
* 存活时间，单位秒
*/
private Long aliveSecond;
/**
* 数据产生速度，单位byte/s
*/
private Long bytesSpeed;
/**
* 音视频轨道
*/
private List<MediaTrack> tracks;
/**
* 音视频轨道
*/
private String vhost;
public static class MediaTrack {
/**
* 音频通道数
*/
private int channels;
/**
* H264 = 0, H265 = 1, AAC = 2, G711A = 3, G711U = 4
*/
private int codecId;
/**
* 编码类型名称 CodecAAC CodecH264
*/
private String codecIdName;
/**
* Video = 0, Audio = 1
*/
private int codecType;
/**
* 轨道是否准备就绪
*/
private boolean ready;
/**
* 音频采样位数
*/
private int sampleBit;
/**
* 音频采样率
*/
private int sampleRate;
/**
* 视频fps
*/
private int fps;
/**
* 视频高
*/
private int height;
/**
* 视频宽
*/
private int width;
public int getChannels() {
return channels;
}
public void setChannels(int channels) {
this.channels = channels;
}
public int getCodecId() {
return codecId;
}
public void setCodecId(int codecId) {
this.codecId = codecId;
}
public String getCodecIdName() {
return codecIdName;
}
public void setCodecIdName(String codecIdName) {
this.codecIdName = codecIdName;
}
public int getCodecType() {
return codecType;
}
public void setCodecType(int codecType) {
this.codecType = codecType;
}
public boolean isReady() {
return ready;
}
public void setReady(boolean ready) {
this.ready = ready;
}
public int getSampleBit() {
return sampleBit;
}
public void setSampleBit(int sampleBit) {
this.sampleBit = sampleBit;
}
public int getSampleRate() {
return sampleRate;
}
public void setSampleRate(int sampleRate) {
this.sampleRate = sampleRate;
}
public int getFps() {
return fps;
}
public void setFps(int fps) {
this.fps = fps;
}
public int getHeight() {
return height;
}
public void setHeight(int height) {
this.height = height;
}
public int getWidth() {
return width;
}
public void setWidth(int width) {
this.width = width;
}
}
public static class OriginSock{
private String identifier;
private String local_ip;
private int local_port;
private String peer_ip;
private int peer_port;
public String getIdentifier() {
return identifier;
}
public void setIdentifier(String identifier) {
this.identifier = identifier;
}
public String getLocal_ip() {
return local_ip;
}
public void setLocal_ip(String local_ip) {
this.local_ip = local_ip;
}
public int getLocal_port() {
return local_port;
}
public void setLocal_port(int local_port) {
this.local_port = local_port;
}
public String getPeer_ip() {
return peer_ip;
}
public void setPeer_ip(String peer_ip) {
this.peer_ip = peer_ip;
}
public int getPeer_port() {
return peer_port;
}
public void setPeer_port(int peer_port) {
this.peer_port = peer_port;
}
}
public String getApp() {
return app;
}
public void setApp(String app) {
this.app = app;
}
public String getStream() {
return stream;
}
public void setStream(String stream) {
this.stream = stream;
}
public String getTotalReaderCount() {
return totalReaderCount;
}
public void setTotalReaderCount(String totalReaderCount) {
this.totalReaderCount = totalReaderCount;
}
public int getOriginType() {
return originType;
}
public void setOriginType(int originType) {
this.originType = originType;
}
public String getOriginTypeStr() {
return originTypeStr;
}
public void setOriginTypeStr(String originTypeStr) {
this.originTypeStr = originTypeStr;
}
public String getOriginUrl() {
return originUrl;
}
public void setOriginUrl(String originUrl) {
this.originUrl = originUrl;
}
public Long getCreateStamp() {
return createStamp;
}
public void setCreateStamp(Long createStamp) {
this.createStamp = createStamp;
}
public Long getAliveSecond() {
return aliveSecond;
}
public void setAliveSecond(Long aliveSecond) {
this.aliveSecond = aliveSecond;
}
public List<MediaTrack> getTracks() {
return tracks;
}
public void setTracks(List<MediaTrack> tracks) {
this.tracks = tracks;
}
public String getSchema() {
return schema;
}
public void setSchema(String schema) {
this.schema = schema;
}
public void setOriginSock(OriginSock originSock) {
this.originSock = originSock;
}
public Long getBytesSpeed() {
return bytesSpeed;
}
public void setBytesSpeed(Long bytesSpeed) {
this.bytesSpeed = bytesSpeed;
}
public String getVhost() {
return vhost;
}
public void setVhost(String vhost) {
this.vhost = vhost;
}
public OriginSock getOriginSock() {
return originSock;
}
}