[WIP] Updates: audio input support

Author: pennycoders

cloud.go

@@ -447,35 +447,76 @@ func handleSessionRequest(
 		}
 	}
 
-	session, err := newSession(SessionConfig{
-		ws:         c,
-		IsCloud:    isCloudConnection,
-		LocalIP:    req.IP,
-		ICEServers: req.ICEServers,
-		Logger:     scopedLogger,
-	})
-	if err != nil {
-		_ = wsjson.Write(context.Background(), c, gin.H{"error": err})
-		return err
-	}
+	var session *Session
+	var err error
+	var sd string
 
-	sd, err := session.ExchangeOffer(req.Sd)
-	if err != nil {
-		_ = wsjson.Write(context.Background(), c, gin.H{"error": err})
-		return err
-	}
+	// Check if we have an existing session and handle renegotiation
 	if currentSession != nil {
-		writeJSONRPCEvent("otherSessionConnected", nil, currentSession)
-		peerConn := currentSession.peerConnection
-		go func() {
-			time.Sleep(1 * time.Second)
-			_ = peerConn.Close()
-		}()
+		scopedLogger.Info().Msg("handling renegotiation for existing session")
+		
+		// Handle renegotiation with existing session
+		sd, err = currentSession.ExchangeOffer(req.Sd)
+		if err != nil {
+			scopedLogger.Warn().Err(err).Msg("renegotiation failed, creating new session")
+			// If renegotiation fails, fall back to creating a new session
+			session, err = newSession(SessionConfig{
+				ws:         c,
+				IsCloud:    isCloudConnection,
+				LocalIP:    req.IP,
+				ICEServers: req.ICEServers,
+				Logger:     scopedLogger,
+			})
+			if err != nil {
+				_ = wsjson.Write(context.Background(), c, gin.H{"error": err})
+				return err
+			}
+
+			sd, err = session.ExchangeOffer(req.Sd)
+			if err != nil {
+				_ = wsjson.Write(context.Background(), c, gin.H{"error": err})
+				return err
+			}
+
+			// Close the old session
+			writeJSONRPCEvent("otherSessionConnected", nil, currentSession)
+			peerConn := currentSession.peerConnection
+			go func() {
+				time.Sleep(1 * time.Second)
+				_ = peerConn.Close()
+			}()
+
+			currentSession = session
+			cloudLogger.Info().Interface("session", session).Msg("new session created after renegotiation failure")
+		} else {
+			scopedLogger.Info().Msg("renegotiation successful")
+		}
+	} else {
+		// No existing session, create a new one
+		scopedLogger.Info().Msg("creating new session")
+		session, err = newSession(SessionConfig{
+			ws:         c,
+			IsCloud:    isCloudConnection,
+			LocalIP:    req.IP,
+			ICEServers: req.ICEServers,
+			Logger:     scopedLogger,
+		})
+		if err != nil {
+			_ = wsjson.Write(context.Background(), c, gin.H{"error": err})
+			return err
+		}
+
+		sd, err = session.ExchangeOffer(req.Sd)
+		if err != nil {
+			_ = wsjson.Write(context.Background(), c, gin.H{"error": err})
+			return err
+		}
+
+		currentSession = session
+		cloudLogger.Info().Interface("session", session).Msg("new session accepted")
+		cloudLogger.Trace().Interface("session", session).Msg("new session accepted")
 	}
 
-	cloudLogger.Info().Interface("session", session).Msg("new session accepted")
-	cloudLogger.Trace().Interface("session", session).Msg("new session accepted")
-	currentSession = session
 	_ = wsjson.Write(context.Background(), c, gin.H{"type": "answer", "data": sd})
 	return nil
 }

internal/audio/api.go

@@ -1,11 +1,13 @@
 package audio
 
 // StartAudioStreaming launches the in-process audio stream and delivers Opus frames to the provided callback.
+// This is now a wrapper around the non-blocking audio implementation for backward compatibility.
 func StartAudioStreaming(send func([]byte)) error {
-	return StartCGOAudioStream(send)
+	return StartNonBlockingAudioStreaming(send)
 }
 
 // StopAudioStreaming stops the in-process audio stream.
+// This is now a wrapper around the non-blocking audio implementation for backward compatibility.
 func StopAudioStreaming() {
-	StopCGOAudioStream()
+	StopNonBlockingAudioStreaming()
 }

internal/audio/audio.go

@@ -1,11 +1,16 @@
 package audio
 
 import (
+	"errors"
 	"sync/atomic"
 	"time"
 	// Explicit import for CGO audio stream glue
 )
 
+var (
+	ErrAudioAlreadyRunning = errors.New("audio already running")
+)
+
 const MaxAudioFrameSize = 1500
 
 // AudioQuality represents different audio quality presets
@@ -46,6 +51,13 @@ var (
 		Channels:   2,
 		FrameSize:  20 * time.Millisecond,
 	}
+	currentMicrophoneConfig = AudioConfig{
+		Quality:    AudioQualityMedium,
+		Bitrate:    32,
+		SampleRate: 48000,
+		Channels:   1,
+		FrameSize:  20 * time.Millisecond,
+	}
 	metrics AudioMetrics
 )
 
@@ -55,14 +67,14 @@ func GetAudioQualityPresets() map[AudioQuality]AudioConfig {
 		AudioQualityLow: {
 			Quality:    AudioQualityLow,
 			Bitrate:    32,
-			SampleRate: 48000,
-			Channels:   2,
-			FrameSize:  20 * time.Millisecond,
+			SampleRate: 22050,
+			Channels:   1,
+			FrameSize:  40 * time.Millisecond,
 		},
 		AudioQualityMedium: {
 			Quality:    AudioQualityMedium,
 			Bitrate:    64,
-			SampleRate: 48000,
+			SampleRate: 44100,
 			Channels:   2,
 			FrameSize:  20 * time.Millisecond,
 		},
@@ -75,14 +87,48 @@ func GetAudioQualityPresets() map[AudioQuality]AudioConfig {
 		},
 		AudioQualityUltra: {
 			Quality:    AudioQualityUltra,
-			Bitrate:    256,
+			Bitrate:    192,
 			SampleRate: 48000,
 			Channels:   2,
 			FrameSize:  10 * time.Millisecond,
 		},
 	}
 }
 
+// GetMicrophoneQualityPresets returns predefined quality configurations for microphone input
+func GetMicrophoneQualityPresets() map[AudioQuality]AudioConfig {
+	return map[AudioQuality]AudioConfig{
+		AudioQualityLow: {
+			Quality:    AudioQualityLow,
+			Bitrate:    16,
+			SampleRate: 16000,
+			Channels:   1,
+			FrameSize:  40 * time.Millisecond,
+		},
+		AudioQualityMedium: {
+			Quality:    AudioQualityMedium,
+			Bitrate:    32,
+			SampleRate: 22050,
+			Channels:   1,
+			FrameSize:  20 * time.Millisecond,
+		},
+		AudioQualityHigh: {
+			Quality:    AudioQualityHigh,
+			Bitrate:    64,
+			SampleRate: 44100,
+			Channels:   1,
+			FrameSize:  20 * time.Millisecond,
+		},
+		AudioQualityUltra: {
+			Quality:    AudioQualityUltra,
+			Bitrate:    96,
+			SampleRate: 48000,
+			Channels:   1,
+			FrameSize:  10 * time.Millisecond,
+		},
+	}
+}
+
 // SetAudioQuality updates the current audio quality configuration
 func SetAudioQuality(quality AudioQuality) {
 	presets := GetAudioQualityPresets()
@@ -96,6 +142,19 @@ func GetAudioConfig() AudioConfig {
 	return currentConfig
 }
 
+// SetMicrophoneQuality updates the current microphone quality configuration
+func SetMicrophoneQuality(quality AudioQuality) {
+	presets := GetMicrophoneQualityPresets()
+	if config, exists := presets[quality]; exists {
+		currentMicrophoneConfig = config
+	}
+}
+
+// GetMicrophoneConfig returns the current microphone configuration
+func GetMicrophoneConfig() AudioConfig {
+	return currentMicrophoneConfig
+}
+
 // GetAudioMetrics returns current audio metrics
 func GetAudioMetrics() AudioMetrics {
 	return AudioMetrics{