-
Notifications
You must be signed in to change notification settings - Fork 107
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use cscore for PublishVideoOperation #866
base: master
Are you sure you want to change the base?
Changes from 6 commits
d16e05d
af7ebeb
1691326
86829a7
a65ffd2
40343c8
93022f7
b4bff3b
c1869f8
54da545
644cab8
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,149 +7,141 @@ | |
import edu.wpi.grip.core.sockets.SocketHints; | ||
import edu.wpi.grip.core.util.Icon; | ||
|
||
import com.google.common.annotations.VisibleForTesting; | ||
import com.google.common.collect.ImmutableList; | ||
|
||
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; | ||
|
||
import org.bytedeco.javacpp.BytePointer; | ||
import org.bytedeco.javacpp.IntPointer; | ||
|
||
import java.io.DataInputStream; | ||
import java.io.DataOutputStream; | ||
import java.io.IOException; | ||
import java.net.ServerSocket; | ||
import java.net.Socket; | ||
import edu.wpi.cscore.CameraServerJNI; | ||
import edu.wpi.cscore.CvSource; | ||
import edu.wpi.cscore.MjpegServer; | ||
import edu.wpi.cscore.VideoMode; | ||
import edu.wpi.first.wpilibj.networktables.NetworkTable; | ||
import edu.wpi.first.wpilibj.tables.ITable; | ||
|
||
import org.bytedeco.javacpp.opencv_core; | ||
import org.opencv.core.Mat; | ||
|
||
import java.net.Inet4Address; | ||
import java.net.NetworkInterface; | ||
import java.net.SocketException; | ||
import java.util.Collection; | ||
import java.util.Collections; | ||
import java.util.Deque; | ||
import java.util.LinkedList; | ||
import java.util.List; | ||
import java.util.logging.Level; | ||
import java.util.logging.Logger; | ||
|
||
import static org.bytedeco.javacpp.opencv_core.Mat; | ||
import static org.bytedeco.javacpp.opencv_imgcodecs.CV_IMWRITE_JPEG_QUALITY; | ||
import static org.bytedeco.javacpp.opencv_imgcodecs.imencode; | ||
import java.util.stream.Collectors; | ||
import java.util.stream.Stream; | ||
|
||
/** | ||
* Publish an M-JPEG stream with the protocol used by SmartDashboard and the FRC Dashboard. This | ||
* allows FRC teams to view video streams on their dashboard during competition even when GRIP has | ||
* exclusive access to the camera. In addition, an intermediate processed image in the pipeline | ||
* could be published instead. Based on WPILib's CameraServer class: | ||
* https://github.com/robotpy/allwpilib/blob/master/wpilibj/src/athena/java/edu/wpi/first/wpilibj | ||
* /CameraServer.java | ||
* exclusive access to the camera. Uses cscore to host the image streaming server. | ||
*/ | ||
public class PublishVideoOperation implements Operation { | ||
|
||
private static final Logger logger = Logger.getLogger(PublishVideoOperation.class.getName()); | ||
|
||
/** | ||
* Flags whether or not cscore was loaded. If it could not be loaded, the MJPEG streaming server | ||
* can't be started, preventing this operation from running. | ||
*/ | ||
private static final boolean cscoreLoaded; | ||
|
||
private static final List<NetworkInterface> networkInterfaces; | ||
|
||
static { | ||
boolean loaded; | ||
try { | ||
// Loading the CameraServerJNI class will load the appropriate platform-specific OpenCV JNI | ||
CameraServerJNI.getHostname(); | ||
loaded = true; | ||
} catch (Throwable e) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can native bindings ever throw an There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's most likely to be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unless we explicitly throw interrupted from the JNI level, nothing in JNI otherwise would throw it. And since its a dumb idea to interrupt a thread anyway, we would never throw it internally. Pretty much all that shows up is UnsatisfiedLinkError, or one of the few runtime exceptions we throw. Note this should be using forceLoad(), not getHostname() (I don't think we had forceLoad() then), but I will my sure my version does that. |
||
logger.log(Level.SEVERE, "CameraServerJNI load failed!", e); | ||
loaded = false; | ||
} | ||
cscoreLoaded = loaded; | ||
|
||
List<NetworkInterface> interfaces; | ||
try { | ||
interfaces = Collections.list(NetworkInterface.getNetworkInterfaces()); | ||
} catch (SocketException e) { | ||
logger.log(Level.SEVERE, "Could not get the local network interfaces", e); | ||
interfaces = Collections.emptyList(); | ||
} | ||
networkInterfaces = interfaces; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Does this need to happen statically? Can't this be done when the operation is constructed? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Then the cscore loading check would happen every time a new operation is created instead of only once, when the class loads. I'd prefer to just have a flag set so the operation can be created normally and just throw an exception in |
||
|
||
public static final OperationDescription DESCRIPTION = | ||
OperationDescription.builder() | ||
.name("Publish Video") | ||
.summary("Publish an M_JPEG stream to the dashboard.") | ||
.category(OperationDescription.Category.NETWORK) | ||
.icon(Icon.iconStream("publish-video")) | ||
.build(); | ||
private static final int PORT = 1180; | ||
private static final byte[] MAGIC_NUMBER = {0x01, 0x00, 0x00, 0x00}; | ||
private static final int INITIAL_PORT = 1180; | ||
private static final int MAX_STEP_COUNT = 10; // limit ports to 1180-1189 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||
|
||
@SuppressWarnings("PMD.AssignmentToNonFinalStatic") | ||
private static int totalStepCount; | ||
@SuppressWarnings("PMD.AssignmentToNonFinalStatic") | ||
private static int numSteps; | ||
private final Object imageLock = new Object(); | ||
private final BytePointer imagePointer = new BytePointer(); | ||
private final Thread serverThread; | ||
private final InputSocket<Mat> inputSocket; | ||
private static final Deque<Integer> availablePorts = | ||
Stream.iterate(INITIAL_PORT, i -> i + 1) | ||
.limit(MAX_STEP_COUNT) | ||
.collect(Collectors.toCollection(LinkedList::new)); | ||
|
||
private final InputSocket<opencv_core.Mat> inputSocket; | ||
private final InputSocket<Number> qualitySocket; | ||
@SuppressWarnings("PMD.SingularField") | ||
private volatile boolean connected = false; | ||
/** | ||
* Listens for incoming connections on port 1180 and writes JPEG data whenever there's a new | ||
* frame. | ||
*/ | ||
private final Runnable runServer = () -> { | ||
// Loop forever (or at least until the thread is interrupted). This lets us recover from the | ||
// dashboard | ||
// disconnecting or the network connection going away temporarily. | ||
while (!Thread.currentThread().isInterrupted()) { | ||
try (ServerSocket serverSocket = new ServerSocket(PORT)) { | ||
logger.info("Starting camera server"); | ||
|
||
try (Socket socket = serverSocket.accept()) { | ||
logger.info("Got connection from " + socket.getInetAddress()); | ||
connected = true; | ||
|
||
DataOutputStream socketOutputStream = new DataOutputStream(socket.getOutputStream()); | ||
DataInputStream socketInputStream = new DataInputStream(socket.getInputStream()); | ||
|
||
byte[] buffer = new byte[128 * 1024]; | ||
int bufferSize; | ||
|
||
final int fps = socketInputStream.readInt(); | ||
final int compression = socketInputStream.readInt(); | ||
final int size = socketInputStream.readInt(); | ||
|
||
if (compression != -1) { | ||
logger.warning("Dashboard video should be in HW mode"); | ||
} | ||
|
||
final long frameDuration = 1000000000L / fps; | ||
long startTime = System.nanoTime(); | ||
|
||
while (!socket.isClosed() && !Thread.currentThread().isInterrupted()) { | ||
// Wait for the main thread to put a new image. This happens whenever perform() is | ||
// called with | ||
// a new input. | ||
synchronized (imageLock) { | ||
imageLock.wait(); | ||
|
||
// Copy the image data into a pre-allocated buffer, growing it if necessary | ||
bufferSize = imagePointer.limit(); | ||
if (bufferSize > buffer.length) { | ||
buffer = new byte[imagePointer.limit()]; | ||
} | ||
imagePointer.get(buffer, 0, bufferSize); | ||
} | ||
|
||
// The FRC dashboard image protocol consists of a magic number, the size of the image | ||
// data, | ||
// and the image data itself. | ||
socketOutputStream.write(MAGIC_NUMBER); | ||
socketOutputStream.writeInt(bufferSize); | ||
socketOutputStream.write(buffer, 0, bufferSize); | ||
|
||
// Limit the FPS to whatever the dashboard requested | ||
int remainingTime = (int) (frameDuration - (System.nanoTime() - startTime)); | ||
if (remainingTime > 0) { | ||
Thread.sleep(remainingTime / 1000000, remainingTime % 1000000); | ||
} | ||
|
||
startTime = System.nanoTime(); | ||
} | ||
} | ||
} catch (IOException e) { | ||
logger.log(Level.WARNING, e.getMessage(), e); | ||
} catch (InterruptedException e) { | ||
Thread.currentThread().interrupt(); // This is really unnecessary since the thread is | ||
// about to exit | ||
logger.info("Shutting down camera server"); | ||
return; | ||
} finally { | ||
connected = false; | ||
} | ||
} | ||
}; | ||
private final MjpegServer server; | ||
private final CvSource serverSource; | ||
|
||
// Write to the /CameraPublisher table so the MJPEG streams are discoverable by other | ||
// applications connected to the same NetworkTable server (eg Shuffleboard) | ||
private final ITable cameraPublisherTable = NetworkTable.getTable("/CameraPublisher"); // NOPMD | ||
private final ITable ourTable; | ||
private Mat publishMat = null; | ||
private long lastFrame = -1; | ||
|
||
@SuppressWarnings("JavadocMethod") | ||
@SuppressFBWarnings(value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD", | ||
justification = "Do not need to synchronize inside of a constructor") | ||
public PublishVideoOperation(InputSocket.Factory inputSocketFactory) { | ||
if (numSteps != 0) { | ||
throw new IllegalStateException("Only one instance of PublishVideoOperation may exist"); | ||
if (numSteps >= MAX_STEP_COUNT) { | ||
throw new IllegalStateException( | ||
"Only " + MAX_STEP_COUNT + " instances of PublishVideoOperation may exist"); | ||
} | ||
this.inputSocket = inputSocketFactory.create(SocketHints.Inputs.createMatSocketHint("Image", | ||
false)); | ||
this.qualitySocket = inputSocketFactory.create(SocketHints.Inputs | ||
.createNumberSliderSocketHint("Quality", 80, 0, 100)); | ||
numSteps++; | ||
|
||
serverThread = new Thread(runServer, "Camera Server"); | ||
serverThread.setDaemon(true); | ||
serverThread.start(); | ||
if (cscoreLoaded) { | ||
int ourPort = availablePorts.removeFirst(); | ||
|
||
server = new MjpegServer("GRIP video publishing server " + totalStepCount, ourPort); | ||
serverSource = new CvSource("GRIP CvSource " + totalStepCount, | ||
VideoMode.PixelFormat.kMJPEG, 0, 0, 0); | ||
server.setSource(serverSource); | ||
|
||
ourTable = cameraPublisherTable.getSubTable("GRIP-" + totalStepCount); | ||
try { | ||
List<NetworkInterface> networkInterfaces = | ||
Collections.list(NetworkInterface.getNetworkInterfaces()); | ||
ourTable.putStringArray("streams", generateStreams(networkInterfaces, ourPort)); | ||
} catch (SocketException e) { | ||
logger.log(Level.WARNING, "Could not enumerate the local network interfaces", e); | ||
ourTable.putStringArray("streams", new String[0]); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we log something here? Or maybe throw exceptions in There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Maybe? The documentation isn't very clear on what circumstances will cause this exception to be thrown. It might never be thrown for the local host since it appears to only happen if the host is unreachable. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Interesting. @PeterJohnson do you have any thoughts on what might cause this on the local system or if this is a non-issue? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It sounds like how the Java getLocalHost function works is it gets the local hostname, then resolves it into an address. So it's definitely possible to fail: https://stackoverflow.com/questions/1881546/inetaddress-getlocalhost-throws-unknownhostexception |
||
} | ||
} else { | ||
server = null; | ||
serverSource = null; | ||
ourTable = null; | ||
} | ||
|
||
numSteps++; | ||
totalStepCount++; | ||
} | ||
|
||
@Override | ||
|
@@ -167,25 +159,87 @@ public List<OutputSocket> getOutputSockets() { | |
|
||
@Override | ||
public void perform() { | ||
if (!connected) { | ||
return; // Don't waste any time converting images if there's no dashboard connected | ||
final long now = System.nanoTime(); // NOPMD | ||
|
||
if (!cscoreLoaded) { | ||
throw new IllegalStateException( | ||
"cscore could not be loaded. The image streaming server cannot be started."); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||
} | ||
|
||
if (inputSocket.getValue().get().empty()) { | ||
opencv_core.Mat input = inputSocket.getValue().get(); | ||
if (input.empty() || input.isNull()) { | ||
throw new IllegalArgumentException("Input image must not be empty"); | ||
} | ||
|
||
synchronized (imageLock) { | ||
imencode(".jpeg", inputSocket.getValue().get(), imagePointer, | ||
new IntPointer(CV_IMWRITE_JPEG_QUALITY, qualitySocket.getValue().get().intValue())); | ||
imageLock.notifyAll(); | ||
// "copy" the input data to an OpenCV mat for cscore to use | ||
// This basically just wraps the mat pointer in a different wrapper object | ||
// No copies are performed, but it means we have to be careful about making sure we use the | ||
// same version of JavaCV and OpenCV to minimize the risk of binary incompatibility. | ||
// This copy only needs to happen once, since the operation input image is always the same | ||
// object that gets copied into. The data address will change, however, if the image is resized | ||
// or changes type. | ||
if (publishMat == null || publishMat.nativeObj != input.address()) { | ||
publishMat = new Mat(input.address()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you keep the test you had for There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sure. |
||
} | ||
// Make sure the output resolution is up to date. Might not be needed, depends on cscore updates | ||
serverSource.setResolution(input.size().width(), input.size().height()); | ||
serverSource.putFrame(publishMat); | ||
if (lastFrame != -1) { | ||
long dt = now - lastFrame; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I've seen this actually be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It'll actually be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. In kotlin: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's technically infinite since the new frame comes at the same time as the previous one. But it doesn't happen here because it's rate limited by the pipeline and the update rate of the pipeline sources. I seriously doubt There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Okay, that's fine then. |
||
serverSource.setFPS((int) (1e9 / dt)); | ||
} | ||
lastFrame = now; | ||
} | ||
|
||
@Override | ||
public synchronized void cleanUp() { | ||
// Stop the video server if there are no Publish Video steps left | ||
serverThread.interrupt(); | ||
numSteps--; | ||
if (cscoreLoaded) { | ||
availablePorts.addFirst(server.getPort()); | ||
ourTable.getKeys().forEach(ourTable::delete); | ||
serverSource.setConnected(false); | ||
serverSource.free(); | ||
server.free(); | ||
if (publishMat != null) { | ||
publishMat.release(); | ||
} | ||
} | ||
} | ||
|
||
/** | ||
* Generates an array of stream URLs that allow third-party applications to discover the | ||
* appropriate URLs that can stream MJPEG. The URLs will all point to the same physical machine, | ||
* but may use different network interfaces (eg WiFi and ethernet). | ||
* | ||
* @param networkInterfaces the local network interfaces | ||
* @param serverPort the port the mjpeg streaming server is running on | ||
* @return an array of URLs that can be used to connect to the MJPEG streaming server | ||
*/ | ||
@VisibleForTesting | ||
static String[] generateStreams(Collection<NetworkInterface> networkInterfaces, int serverPort) { | ||
return networkInterfaces.stream() | ||
.flatMap(i -> Collections.list(i.getInetAddresses()).stream()) | ||
.filter(a -> a instanceof Inet4Address) // IPv6 isn't well supported, stick to IPv4 | ||
.filter(a -> !a.isLoopbackAddress()) // loopback addresses only work for local processes | ||
.distinct() | ||
.flatMap(a -> Stream.of( | ||
generateStreamUrl(a.getHostName(), serverPort), | ||
generateStreamUrl(a.getHostAddress(), serverPort))) | ||
.distinct() | ||
.toArray(String[]::new); | ||
} | ||
|
||
/** | ||
* Generates a URL that can be used to connect to an MJPEG stream provided by cscore. The host | ||
* should be a non-loopback IPv4 address that is resolvable by applications running on non-local | ||
* machines. | ||
* | ||
* @param host the server host | ||
* @param port the port the server is running on | ||
*/ | ||
@VisibleForTesting | ||
static String generateStreamUrl(String host, int port) { | ||
return String.format("mjpeg:http://%s:%d/?action=stream", host, port); | ||
} | ||
|
||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Commented out because there's no
opencv-3.2.0-1.3
with thelinux-frc
classifier and I'm worried about different memory models between binding versions (JavaCV with 3.0.0, OpenCV with 3.2.0) . This could get removed entirely if we remove the deploy functionality.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With this commented out as it is is the deploy functionality essentially nerfed? If so, then we should remove the deployer for this season.