|
@@ -242,15 +242,8 @@ ffmpeg -i "concat:1.ts|2.ts" -c copy output.mp4
|
|
|
* @return
|
|
|
*/
|
|
|
public static String getPlayFlv(String cameraCode, String channel, boolean flay, String state) {
|
|
|
- log.info("getPlayFlv----state---------"+state);
|
|
|
- if (state.contains("master")) {
|
|
|
log.info("getPlayFlv----master---------"+wsUrl);
|
|
|
return wsUrl + "/ws/" + cameraCode + "/" + channel + ".flv";
|
|
|
- } else {
|
|
|
- log.info("getPlayFlv------slave------"+wsUrls);
|
|
|
- return wsUrls + "/ws/" + cameraCode + "/" + channel + ".flv";
|
|
|
- }
|
|
|
-
|
|
|
|
|
|
// if (!flay) {
|
|
|
// return bakUrl + "/ws/" + channel + "/" + cameraCode + ".flv";
|