Feature/capture magewell #183
Merged
Conversation
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
…cording and playback have to match Former-commit-id: 52b517bfe606ec621c0ce141b1edb26554730ee0
…ll lots of testing to do Former-commit-id: a1d3686107f03dbea31b1f7719a8cae9caa90cf2
Former-commit-id: 33cbd24d0de8b454340cc03fd5df7ba119ab78f1
# Conflicts: # scs2-session-visualizer-jfx/build.gradle.kts # scs2-session-visualizer-jfx/src/test/java/us/ihmc/scs2/sessionVisualizer/jfx/session/TimestampScrubberTest.java
…taReader and the MagewellVideoDataReader for backwards compatability
.../src/main/java/us/ihmc/scs2/sessionVisualizer/jfx/session/log/BlackMagicVideoDataReader.java
Show resolved
Hide resolved
...alizer-jfx/src/main/java/us/ihmc/scs2/sessionVisualizer/jfx/session/log/MagewellDemuxer.java
Outdated
Show resolved
Hide resolved
...fx/src/main/java/us/ihmc/scs2/sessionVisualizer/jfx/session/log/MagewellVideoDataReader.java
Show resolved
Hide resolved
...r-jfx/src/main/java/us/ihmc/scs2/sessionVisualizer/jfx/session/log/MultiVideoDataReader.java
Outdated
Show resolved
Hide resolved
...r-jfx/src/main/java/us/ihmc/scs2/sessionVisualizer/jfx/session/log/MultiVideoDataReader.java
Show resolved
Hide resolved
...alizer-jfx/src/main/java/us/ihmc/scs2/sessionVisualizer/jfx/session/log/VideoDataReader.java
Show resolved
Hide resolved
...visualizer-jfx/src/main/java/us/ihmc/scs2/sessionVisualizer/jfx/session/log/VideoViewer.java
Outdated
Show resolved
Hide resolved
...izer-jfx/src/test/java/us/ihmc/scs2/sessionVisualizer/jfx/session/TimestampScrubberTest.java
Outdated
Show resolved
Hide resolved
PotatoPeeler3000
changed the title
|
This build is failing because its pulling the logger code from the wrong branch, not sure how to fix that rn but it claims it can't find the camera.getType() method which does exist on my branch |
… out duplicated code to its own classes
PotatoPeeler3000
force-pushed
the
feature/capture-magewell
branch
from
33542b0 to
e5fae06
Compare
PotatoPeeler3000
commented
Aug 5, 2024
.../src/main/java/us/ihmc/scs2/sessionVisualizer/jfx/session/log/BlackMagicVideoDataReader.java
Show resolved
Hide resolved
.../src/main/java/us/ihmc/scs2/sessionVisualizer/jfx/session/log/BlackMagicVideoDataReader.java
Show resolved
Hide resolved
...n-visualizer-jfx/src/main/java/us/ihmc/scs2/sessionVisualizer/jfx/session/log/FrameData.java
Show resolved
Hide resolved
...izer-jfx/src/test/java/us/ihmc/scs2/sessionVisualizer/jfx/session/TimestampScrubberTest.java
Outdated
Show resolved
Hide resolved
...r-jfx/src/main/java/us/ihmc/scs2/sessionVisualizer/jfx/session/log/MultiVideoDataReader.java
Show resolved
Hide resolved
…ted out a MagewellMuxer and MagewellDemuxer to enable cropping logs corrrectly
|
@PotatoPeeler3000 Can you add me back as a reviewer when it's ready? |
|
CI is failing, can you check that? |
ds58
requested changes
Aug 8, 2024
.../src/main/java/us/ihmc/scs2/sessionVisualizer/jfx/session/log/BlackMagicVideoDataReader.java
Show resolved
Hide resolved
| * This class is used for debugging timestamp delays in the videos when viewing them in SCS2. In order to see the timestamp debugging information change the | ||
| * boolean in {@link VideoViewer#LOGGER_VIDEO_DEBUG} to true. This can also be set as an environmental variable. | ||
| */ | ||
| public class FrameData |
There was a problem hiding this comment.
Can you make this a java record instead of a class?
...fx/src/main/java/us/ihmc/scs2/sessionVisualizer/jfx/session/log/MagewellVideoDataReader.java
Show resolved
Hide resolved
scs2-simulation/src/main/java/us/ihmc/scs2/simulation/collision/CollisionTools.java
Outdated
Show resolved
Hide resolved
…to the updated names
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR allows for viewing videos and logs recorded with a Magewell capture device. Unfortunately videos recorded with Magewell can't be played back with the previous implementation so a specific magewell one had to be made resulting in the following interface
VideoDataPlayerwhich has specific implementations for Magewell and Blackmagic.This follows the logger PR to enable logging with ihmcrobotics/ihmc-robot-data-logger#8