roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化streamchannge hook以及对推流的识别

Browse Source
This commit is contained in:
648540858
2021-11-24 11:19:52 +08:00
parent 0eee65bc42
commit f61051c463
14 changed files with 129 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
View File

@@ -135,7 +135,7 @@ public interface IRedisCatchStorage {
* @param app
* @param streamId
*/
void addStream(MediaServerItem mediaServerItem, String app, String streamId, StreamInfo streamInfo);
void addPushStream(MediaServerItem mediaServerItem, String app, String streamId, StreamInfo streamInfo);
/**
* 移除流信息从redis
@@ -143,5 +143,5 @@ public interface IRedisCatchStorage {
* @param app
* @param streamId
*/
void removeStream(MediaServerItem mediaServerItem, String app, String streamId);
void removePushStream(MediaServerItem mediaServerItem, String app, String streamId);
}

4
src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
View File

@@ -353,7 +353,7 @@ public interface IVideoManagerStorager {
* @param app
* @param stream
*/
void removeMedia(String app, String stream);
int removeMedia(String app, String stream);
/**
@@ -366,7 +366,7 @@ public interface IVideoManagerStorager {
* @param app
* @param streamId
*/
void mediaOutline(String app, String streamId);
int mediaOutline(String app, String streamId);
/**
* 设置平台在线/离线

2
src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
View File

@@ -53,7 +53,7 @@ public interface GbStreamMapper {
@Update("UPDATE gb_stream " +
"SET status=${status} " +
"WHERE app=#{app} AND stream=#{stream}")
void setStatus(String app, String stream, boolean status);
int setStatus(String app, String stream, boolean status);
@Select("SELECT gs.*, pgs.platformId FROM gb_stream gs LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream WHERE mediaServerId=#{mediaServerId} ")
List<GbStream> selectAllByMediaServerId(String mediaServerId);

4
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
View File

@@ -308,13 +308,13 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
}
@Override
public void addStream(MediaServerItem mediaServerItem, String app, String streamId, StreamInfo streamInfo) {
public void addPushStream(MediaServerItem mediaServerItem, String app, String streamId, StreamInfo streamInfo) {
String key = VideoManagerConstants.WVP_SERVER_STREAM_PUSH_PREFIX + app + "_" + streamId + "_" + mediaServerItem.getId();
redis.set(key, streamInfo);
}
@Override
public void removeStream(MediaServerItem mediaServerItem, String app, String streamId) {
public void removePushStream(MediaServerItem mediaServerItem, String app, String streamId) {
String key = VideoManagerConstants.WVP_SERVER_STREAM_PUSH_PREFIX + app + "_" + streamId + "_" + mediaServerItem.getId();
redis.del(key);
}

8
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
View File

@@ -605,8 +605,8 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
}
@Override
public void removeMedia(String app, String stream) {
streamPushMapper.del(app, stream);
public int removeMedia(String app, String stream) {
return streamPushMapper.del(app, stream);
}
@Override
@@ -615,8 +615,8 @@ public class VideoManagerStoragerImpl implements IVideoManagerStorager {
}
@Override
public void mediaOutline(String app, String streamId) {
gbStreamMapper.setStatus(app, streamId, false);
public int mediaOutline(String app, String streamId) {
return gbStreamMapper.setStatus(app, streamId, false);
}
@Override