gilles/go2rtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change ListSizes function for V4L2 device

Browse Source
This commit is contained in:
Alex X
2025-01-07 22:17:35 +03:00
parent e4b8d1807d
commit 93252fc5d2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/v4l2/v4l2_linux.go
+3 -3
View File
@@ -58,9 +58,9 @@ func apiV4L2(w http.ResponseWriter, r *http.Request) {
if source.Name != "" { if source.Name != "" {
sizes, _ := dev.ListSizes(fourCC) sizes, _ := dev.ListSizes(fourCC)
for i := 0; i < len(sizes); i += 2 { for _, wh := range sizes {
size := fmt.Sprintf("%dx%d", sizes[i], sizes[i+1]) size := fmt.Sprintf("%dx%d", wh[0], wh[1])
if i > 0 { if source.Info != "" {
source.Info += " " + size source.Info += " " + size
} else { } else {
source.Info = size source.Info = size
pkg/v4l2/device/device.go
+3 -3
View File
@@ -66,8 +66,8 @@ func (d *Device) ListFormats() ([]uint32, error) {
return items, nil return items, nil
} }
func (d *Device) ListSizes(pixFmt uint32) ([]uint32, error) { func (d *Device) ListSizes(pixFmt uint32) ([][2]uint32, error) {
var items []uint32 var items [][2]uint32
for i := uint32(0); ; i++ { for i := uint32(0); ; i++ {
fs := v4l2_frmsizeenum{ fs := v4l2_frmsizeenum{
@@ -85,7 +85,7 @@ func (d *Device) ListSizes(pixFmt uint32) ([]uint32, error) {
continue continue
} }
items = append(items, fs.discrete.width, fs.discrete.height) items = append(items, [2]uint32{fs.discrete.width, fs.discrete.height})
} }
return items, nil return items, nil