Skip to content

Commit

Permalink
Merge branch 'feature/video-ffmpeg' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
paulosousadias committed Nov 21, 2023
2 parents fa1fd15 + 91d2475 commit d97a79d
Show file tree
Hide file tree
Showing 10 changed files with 1,807 additions and 0 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -544,6 +544,7 @@ project(':core') {

implementation 'com.adobe.xmp:xmpcore:5.1.2' //6.1.10
implementation name: 'xuggle-xuggler-5.4'
implementation 'io.humble:humble-video-all:0.3.0' // Needs to be in the core because of the dll/so libs

implementation 'com.google.zxing:javase:3.2.1' //3.4.0

Expand Down
4 changes: 4 additions & 0 deletions plugins-dev/videoreader/build.gradle
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
}

1 change: 1 addition & 0 deletions plugins-dev/videoreader/plugins.lst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
pt.lsts.neptus.plugins.videoreader.VideoReader
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 + ")";
}
}
Loading

0 comments on commit d97a79d

Please sign in to comment.