Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修正拼写错误

pull/1/head
Lawrence 2020-10-29 10:16:39 +08:00
parent 1ec70660c6
commit 56996e2138
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
View File

@ -329,7 +329,7 @@ public class SIPCommander implements ISIPCommander {
streamInfo.setSsrc(ssrc); streamInfo.setSsrc(ssrc);
streamInfo.setCahnnelId(channelId); streamInfo.setCahnnelId(channelId);
streamInfo.setDeviceID(device.getDeviceId()); streamInfo.setDeviceID(device.getDeviceId());
boolean b = storager.startPlayBlack(streamInfo); boolean b = storager.startPlayback(streamInfo);
return streamInfo; return streamInfo;
} catch ( SipException | ParseException | InvalidArgumentException e) { } catch ( SipException | ParseException | InvalidArgumentException e) {

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

@ -184,11 +184,11 @@ public interface IVideoManagerStorager {
Map<String, StreamInfo> queryPlayByDeviceId(String deviceId); Map<String, StreamInfo> queryPlayByDeviceId(String deviceId);
boolean startPlayBlack(StreamInfo streamInfo); boolean startPlayback(StreamInfo streamInfo);
boolean stopPlayBlack(StreamInfo streamInfo); boolean stopPlayback(StreamInfo streamInfo);
StreamInfo queryPlayBlackByDevice(String deviceId, String channelId); StreamInfo queryPlaybackByDevice(String deviceId, String channelId);
StreamInfo queryPlayBlackBySSRC(String ssrc); StreamInfo queryPlaybackBySSRC(String ssrc);
} }

8
src/main/java/com/genersoft/iot/vmp/storager/jdbc/VideoManagerJdbcStoragerImpl.java
View File

@ -195,22 +195,22 @@ public class VideoManagerJdbcStoragerImpl implements IVideoManagerStorager {
} }
@Override @Override
public boolean startPlayBlack(StreamInfo streamInfo) { public boolean startPlayback(StreamInfo streamInfo) {
return false; return false;
} }
@Override @Override
public boolean stopPlayBlack(StreamInfo streamInfo) { public boolean stopPlayback(StreamInfo streamInfo) {
return false; return false;
} }
@Override @Override
public StreamInfo queryPlayBlackByDevice(String deviceId, String channelId) { public StreamInfo queryPlaybackByDevice(String deviceId, String channelId) {
return null; return null;
} }
@Override @Override
public StreamInfo queryPlayBlackBySSRC(String ssrc) { public StreamInfo queryPlaybackBySSRC(String ssrc) {
return null; return null;
} }
} }

8
src/main/java/com/genersoft/iot/vmp/storager/redis/VideoManagerRedisStoragerImpl.java
View File

@ -409,7 +409,7 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager {
} }
@Override @Override
public StreamInfo queryPlayBlackBySSRC(String ssrc) { public StreamInfo queryPlaybackBySSRC(String ssrc) {
// List<Object> playLeys = redis.keys(String.format("%S_%s_*", VideoManagerConstants.PLAYER_PREFIX, ssrc)); // List<Object> playLeys = redis.keys(String.format("%S_%s_*", VideoManagerConstants.PLAYER_PREFIX, ssrc));
List<Object> playLeys = redis.scan(String.format("%S_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX, ssrc)); List<Object> playLeys = redis.scan(String.format("%S_%s_*", VideoManagerConstants.PLAY_BLACK_PREFIX, ssrc));
if (playLeys == null || playLeys.size() == 0) return null; if (playLeys == null || playLeys.size() == 0) return null;
@ -505,14 +505,14 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager {
@Override @Override
public boolean startPlayBlack(StreamInfo stream) { public boolean startPlayback(StreamInfo stream) {
return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, stream.getSsrc(),stream.getDeviceID(), stream.getCahnnelId()), return redis.set(String.format("%S_%s_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, stream.getSsrc(),stream.getDeviceID(), stream.getCahnnelId()),
stream); stream);
} }
@Override @Override
public boolean stopPlayBlack(StreamInfo streamInfo) { public boolean stopPlayback(StreamInfo streamInfo) {
if (streamInfo == null) return false; if (streamInfo == null) return false;
DeviceChannel deviceChannel = queryChannel(streamInfo.getDeviceID(), streamInfo.getCahnnelId()); DeviceChannel deviceChannel = queryChannel(streamInfo.getDeviceID(), streamInfo.getCahnnelId());
if (deviceChannel != null) { if (deviceChannel != null) {
@ -527,7 +527,7 @@ public class VideoManagerRedisStoragerImpl implements IVideoManagerStorager {
} }
@Override @Override
public StreamInfo queryPlayBlackByDevice(String deviceId, String code) { public StreamInfo queryPlaybackByDevice(String deviceId, String code) {
String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX, String format = String.format("%S_*_%s_%s", VideoManagerConstants.PLAY_BLACK_PREFIX,
deviceId, deviceId,
code); code);