[RSDK-9703] - Maintain dynamic resolution preference through reconfigures #4738
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
viambot
added
the
safe to test
viambot
added
safe to test
viambot
added
safe to test
viambot
added
safe to test
seanavery
changed the title
10 tasks
randhid
reviewed
Jan 24, 2025
Comment on lines
+414
to
+416
| func (state *StreamState) IsResized() bool { | ||
| return state.isResized | ||
| } |
randhid
reviewed
Jan 24, 2025
Comment on lines
+661
to
+691
| // Check stream state for the camera to see if it is in resized mode. | ||
| // If it is in resized mode, we want to apply the resize transformation to the | ||
| // video source before swapping it. | ||
| streamState, ok := server.nameToStreamState[cam.Name().SDPTrackName()] | ||
| if ok && streamState.IsResized() { | ||
| server.logger.Debugf("stream %q is resized attempting to reapply resize transformation", cam.Name().SDPTrackName()) | ||
| mediaProps, err := existing.MediaProperties(server.closedCtx) | ||
| if err != nil { | ||
| server.logger.Errorf("error getting media properties from resize source: %v", err) | ||
| } else { | ||
| // resizeVideoSource should always have a width and height set. | ||
| height, width := mediaProps.Height, mediaProps.Width | ||
| if height != 0 && width != 0 { | ||
| server.logger.Debugf( | ||
| "resizing video source to width %d and height %d", | ||
| width, height, | ||
| ) | ||
| resizer := gostream.NewResizeVideoSource(cam, width, height) | ||
| existing.Swap(resizer) | ||
| continue | ||
| } | ||
| } | ||
| // If we can't get the media properties or the width and height are 0, we fall back to | ||
| // the original source and need to notify the stream state that the source is no longer | ||
| // resized. | ||
| server.logger.Warnf("falling back to original source for stream %q", cam.Name().SDPTrackName()) | ||
| err = streamState.Reset() | ||
| if err != nil { | ||
| server.logger.Errorf("error resetting stream %q: %v", cam.Name().SDPTrackName(), err) | ||
| } | ||
| } |
There was a problem hiding this comment.
Is there a way to test this within an existing test?
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.
Description
This PR adds a check before refreshing a video source to see if it is in resized mode. If the streamState is resized, we re-apply the resize transformation before swapping.
Tests