upgrade malgo to v0.11.10 (#455)

pion · Dec 5, 2022 · cb23f1f · cb23f1f
1 parent a0f090d
commit cb23f1f
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 30 deletions.
diff --git a/examples/go.sum b/examples/go.sum
@@ -9,8 +9,8 @@ github.com/esimov/pigo v1.4.6/go.mod h1:uqj9Y3+3IRYhFK071rxz1QYq0ePhA6+R9jrUZavi
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/gen2brain/malgo v0.10.35 h1:D6aNo/Q0SnzQLHomTydTXxj4AJFdGJcVoE7I8JxPoUo=
-github.com/gen2brain/malgo v0.10.35/go.mod h1:zHSUNZAXfCeNsZou0RtQ6Zk7gDYLIcKOrUWtAdksnEs=
+github.com/gen2brain/malgo v0.11.10 h1:u41QchDBS7Z2rwEVPu7uycK6HA8IyzKoUOhLU7IvYW4=
+github.com/gen2brain/malgo v0.11.10/go.mod h1:f9TtuN7DVrXMiV/yIceMeWpvanyVzJQMlBecJFVMxww=
 github.com/gen2brain/shm v0.0.0-20200228170931-49f9650110c5/go.mod h1:uF6rMu/1nvu+5DpiRLwusA6xB8zlkNoGzKn8lmYONUo=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=

diff --git a/examples/vnc/.gitignore b/examples/vnc/.gitignore
@@ -0,0 +1 @@
+vnc
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.13
 
 require (
 	github.com/blackjack/webcam v0.0.0-20220329180758-ba064708e165
-	github.com/gen2brain/malgo v0.10.35
+	github.com/gen2brain/malgo v0.11.10
 	github.com/google/uuid v1.3.0
 	github.com/kbinani/screenshot v0.0.0-20210720154843-7d3a670d8329
 	github.com/pion/interceptor v0.1.12

diff --git a/go.sum b/go.sum
@@ -5,8 +5,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
-github.com/gen2brain/malgo v0.10.35 h1:D6aNo/Q0SnzQLHomTydTXxj4AJFdGJcVoE7I8JxPoUo=
-github.com/gen2brain/malgo v0.10.35/go.mod h1:zHSUNZAXfCeNsZou0RtQ6Zk7gDYLIcKOrUWtAdksnEs=
+github.com/gen2brain/malgo v0.11.10 h1:u41QchDBS7Z2rwEVPu7uycK6HA8IyzKoUOhLU7IvYW4=
+github.com/gen2brain/malgo v0.11.10/go.mod h1:f9TtuN7DVrXMiV/yIceMeWpvanyVzJQMlBecJFVMxww=
 github.com/gen2brain/shm v0.0.0-20200228170931-49f9650110c5 h1:Y5Q2mEwfzjMt5+3u70Gtw93ZOu2UuPeeeTBDntF7FoY=
 github.com/gen2brain/shm v0.0.0-20200228170931-49f9650110c5/go.mod h1:uF6rMu/1nvu+5DpiRLwusA6xB8zlkNoGzKn8lmYONUo=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=

diff --git a/pkg/driver/microphone/microphone.go b/pkg/driver/microphone/microphone.go
@@ -191,36 +191,32 @@ func (m *microphone) Properties() []prop.Media {
 		isBigEndian = true
 	}
 
-	for ch := m.MinChannels; ch <= m.MaxChannels; ch++ {
+	for _, format := range m.Formats {
 		// FIXME: Currently support 48kHz only. We need to implement a resampler first.
 		// for sampleRate := m.MinSampleRate; sampleRate <= m.MaxSampleRate; sampleRate += sampleRateStep {
 		sampleRate := 48000
-		for i := 0; i < int(m.FormatCount); i++ {
-			format := m.Formats[i]
-
-			supportedProp := prop.Media{
-				Audio: prop.Audio{
-					ChannelCount: int(ch),
-					SampleRate:   int(sampleRate),
-					IsBigEndian:  isBigEndian,
-					// miniaudio only supports interleaved at the moment
-					IsInterleaved: true,
-					// FIXME: should change this to a less discrete value
-					Latency: time.Millisecond * 20,
-				},
-			}
-
-			switch malgo.FormatType(format) {
-			case malgo.FormatF32:
-				supportedProp.SampleSize = 4
-				supportedProp.IsFloat = true
-			case malgo.FormatS16:
-				supportedProp.SampleSize = 2
-				supportedProp.IsFloat = false
-			}
+		supportedProp := prop.Media{
+			Audio: prop.Audio{
+				ChannelCount: int(format.Channels),
+				SampleRate:   int(sampleRate),
+				IsBigEndian:  isBigEndian,
+				// miniaudio only supports interleaved at the moment
+				IsInterleaved: true,
+				// FIXME: should change this to a less discrete value
+				Latency: time.Millisecond * 20,
+			},
+		}
 
-			supportedProps = append(supportedProps, supportedProp)
+		switch malgo.FormatType(format.Format) {
+		case malgo.FormatF32:
+			supportedProp.SampleSize = 4
+			supportedProp.IsFloat = true
+		case malgo.FormatS16:
+			supportedProp.SampleSize = 2
+			supportedProp.IsFloat = false
 		}
+
+		supportedProps = append(supportedProps, supportedProp)
 		// }
 	}
 	return supportedProps