-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'feature/video-ffmpeg' into develop
- Loading branch information
Showing
10 changed files
with
1,807 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
dependencies { | ||
//implementation 'io.humble:humble-video-all:0.3.0' // Needs to be in the core because of the dll/so libs | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
pt.lsts.neptus.plugins.videoreader.VideoReader |
37 changes: 37 additions & 0 deletions
37
plugins-dev/videoreader/src/java/pt/lsts/neptus/plugins/videoreader/Camera.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
package pt.lsts.neptus.plugins.videoreader; | ||
|
||
public class Camera { | ||
private String name; | ||
|
||
private String ip; | ||
private String url; | ||
|
||
public Camera(String name, String ip, String url) { | ||
this.name = name; | ||
this.ip = ip; | ||
this.url = url; | ||
} | ||
|
||
public Camera() { | ||
this.name = "Select Device"; | ||
} | ||
|
||
public String getName() { | ||
return name; | ||
} | ||
|
||
public String getIp() { | ||
if (ip == null) return ""; | ||
return ip; | ||
} | ||
|
||
public String getUrl() { | ||
if (url == null) return ""; | ||
return url; | ||
} | ||
|
||
public String toString() { | ||
if (ip == null) return name; | ||
return name + " (" + ip + ")"; | ||
} | ||
} |
Oops, something went wrong.