package/mediadevices
1
0
Fork 0
mirror of https://github.com/pion/mediadevices.git synced 2025-09-27 04:46:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add props even if framerate is not supported

Browse Source
This commit is contained in:
seanavery
2023-07-19 14:54:42 -04:00
committed by Clyde Bazile
parent 72c1d7bb89
commit dad145ef11
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/driver/camera/camera_linux.go
View File

@@ -316,7 +316,20 @@ func (c *camera) Properties() []prop.Media {
} }
if frameSize.StepWidth == 0 || frameSize.StepHeight == 0 { if frameSize.StepWidth == 0 || frameSize.StepHeight == 0 {
for _, framerate := range c.cam.GetSupportedFramerates(format, frameSize.MinWidth, frameSize.MinHeight) { framerates := c.cam.GetSupportedFramerates(format, uint32(frameSize.MaxWidth), uint32(frameSize.MaxHeight))
// If the camera doesn't support framerate, we just add the resolution and format
if len(framerates) == 0 {
properties = append(properties, prop.Media{
Video: prop.Video{
Width: int(frameSize.MaxWidth),
Height: int(frameSize.MaxHeight),
FrameFormat: supportedFormat,
},
})
continue
}
for _, framerate := range framerates {
for _, fps := range enumFramerate(framerate) { for _, fps := range enumFramerate(framerate) {
properties = append(properties, prop.Media{ properties = append(properties, prop.Media{
Video: prop.Video{ Video: prop.Video{
@@ -346,7 +359,20 @@ func (c *camera) Properties() []prop.Media {
continue continue
} }
for _, framerate := range c.cam.GetSupportedFramerates(format, uint32(width), uint32(height)) { framerates := c.cam.GetSupportedFramerates(format, uint32(width), uint32(height))
// If the camera doesn't support framerate, we just add the resolution and format
if len(framerates) == 0 {
properties = append(properties, prop.Media{
Video: prop.Video{
Width: width,
Height: height,
FrameFormat: supportedFormat,
},
})
continue
}
for _, framerate := range framerates {
for _, fps := range enumFramerate(framerate) { for _, fps := range enumFramerate(framerate) {
properties = append(properties, prop.Media{ properties = append(properties, prop.Media{
Video: prop.Video{ Video: prop.Video{