From 8ac864b033888509e728e59bf73039710e7a4485 Mon Sep 17 00:00:00 2001
From: hasagi <trichimtrich@gmail.com>
Date: Sun, 14 Apr 2019 03:49:37 +0700
Subject: [PATCH] opus on highest quality and suitable framerate, no hope

---
 main.go          | 79 ++++++++++++++++++++++++++++++++++++++++++------
 static/js/ws.js  |  1 -
 ui/director.go   |  6 ++--
 webrtc/webrtc.go |  4 +++
 4 files changed, 77 insertions(+), 13 deletions(-)

diff --git a/main.go b/main.go
index 6640b646..e08036c9 100644
--- a/main.go
+++ b/main.go
@@ -19,9 +19,7 @@ import (
 	"github.com/gorilla/websocket"
 	pionRTC "github.com/pion/webrtc"
 
-	// "github.com/hraban/opus"
 	"gopkg.in/hraban/opus.v2"
-	// "github.com/xlab/opus-go/opus"
 )
 
 
@@ -31,21 +29,26 @@ func fanoutAudio(audioChannel chan float32, roomID string) {
 	pcm := make([]float32, 240)
 
 	enc, err := opus.NewEncoder(48000, 2, opus.AppVoIP)
+	// ix, _ := enc.DTX() //false
+	// ix1, _ := enc.Bitrate() //120000
+	// ix2, _ := enc.Complexity() //9
+	// ix3, _ := enc.MaxBandwidth() //1105
+	// ix4, _ := enc.PacketLossPerc() //0
+
+	enc.SetMaxBandwidth(opus.Fullband)
+	enc.SetBitrateToAuto()
+	enc.SetComplexity(10)
+	
 	if err != nil {
 		log.Println("[!] Cannot create audio encoder")
 		return
 	}
 
-	// var err2 int32
-	// var err error
-	// enc := opus.EncoderCreate(48000, 1, opus.ApplicationAudio, &err2)
-
-	// c := time.Tick(time.Millisecond * 5)
 	c := time.Tick(time.Microsecond * 2500)
 
 	for range c {
 		for i := 0; i < len(pcm); i++ {
-			if i % 2 == 1 {
+			if i % 2 == 0 {
 				select {
 				case sample := <- audioChannel:
 					output = sample
@@ -56,10 +59,10 @@ func fanoutAudio(audioChannel chan float32, roomID string) {
 				pcm[i] = output
 			}
 		}
+		log.Println(pcm)
 
 		data := make([]byte, 1000)
 		n, err := enc.EncodeFloat32(pcm, data)
-		// n := opus.EncodeFloat(enc, pcm, int32(c), data, 1000)
 
 		if err != nil {
 			log.Println("[!] Failed to decode")
@@ -91,6 +94,64 @@ func fanoutAudio(audioChannel chan float32, roomID string) {
 	}
 }
 
+// // fanoutAudio fanout outputs to all webrtc in the same room
+// func fanoutAudio(audioChannel chan float32, roomID string) {
+// 	pcm := make([]float32, 240)
+// 	c := 0
+
+// 	enc, err := opus.NewEncoder(48000, 2, opus.AppAudio)
+// 	if err != nil {
+// 		log.Println("[!] Cannot create audio encoder")
+// 		return
+// 	}
+
+// 	// var err2 int32
+// 	// var err error
+// 	// enc := opus.EncoderCreate(48000, 2, opus.ApplicationAudio, &err2)
+
+// 	// c := time.Tick(time.Millisecond * 5)
+// 	for audio := range audioChannel {
+// 		pcm[c] = audio
+// 		pcm[c + 1] = 0
+// 		c += 2
+// 		if c >= cap(pcm) {
+// 			data := make([]byte, 2880)
+// 			n, err := enc.EncodeFloat32(pcm, data)
+// 			// n := opus.EncodeFloat(enc, pcm, int32(len(pcm)), data, 1000)
+	
+// 			if err != nil {
+// 				log.Println("[!] Failed to decode")
+// 				continue
+// 			}
+// 			data = data[:n]
+	
+// 			isRoomRunning := false
+// 			for _, webRTC := range rooms[roomID].rtcSessions {
+// 				// Client stopped
+// 				if webRTC.IsClosed() {
+// 					continue
+// 				}
+	
+// 				// encode frame
+// 				// fanout imageChannel
+// 				if webRTC.IsConnected() {
+// 					// NOTE: can block here
+// 					webRTC.AudioChannel <- data
+// 				}
+// 				isRoomRunning = true
+// 			}
+	
+// 			if isRoomRunning == false {
+// 				log.Println("Closed room from audio routine", roomID)
+// 				rooms[roomID].closedChannel <- true
+// 			}
+
+// 			c = 0
+// 		}
+
+// 	}
+// }
+
 const (
 	width  = 256
 	height = 240
diff --git a/static/js/ws.js b/static/js/ws.js
index 6e5c3b99..d6220367 100644
--- a/static/js/ws.js
+++ b/static/js/ws.js
@@ -112,7 +112,6 @@ function startGame() {
             localSessionDescription = session;
             log("Send SDP to remote peer");
             conn.send(JSON.stringify({"id": "sdp", "data": session}));
-            console.log(session);
         } else {
             console.log(JSON.stringify(event.candidate));
         }
diff --git a/ui/director.go b/ui/director.go
index 0dd8a39a..2cabd76c 100644
--- a/ui/director.go
+++ b/ui/director.go
@@ -68,10 +68,10 @@ func (d *Director) Start(paths []string) {
 }
 
 func (d *Director) Run() {
-	// c := time.Tick(time.Second / FPS)
+	c := time.Tick(time.Second / FPS)
 L:
-	// for range c {
-	for {
+	for range c {
+	// for {
 		// quit game
 
 		select {
diff --git a/webrtc/webrtc.go b/webrtc/webrtc.go
index 6366699b..ee9bbbc7 100644
--- a/webrtc/webrtc.go
+++ b/webrtc/webrtc.go
@@ -134,7 +134,11 @@ func (w *WebRTC) StartClient(remoteSession string, width, height int) (string, e
 
 	log.Println("=== StartClient ===")
 
+	webrtc.NewRTPOpusCodec(webrtc.DefaultPayloadTypeOpus, 48000)
+	webrtc.NewRTPVP8Codec(webrtc.DefaultPayloadTypeVP8, 90000)
+	
 	w.connection, err = webrtc.NewPeerConnection(config)
+	
 	// m := webrtc.MediaEngine{}
 	// m.RegisterCodec(webrtc.NewRTPOpusCodec(webrtc.DefaultPayloadTypeOpus, 48000))
 	// m.RegisterCodec(webrtc.NewRTPVP8Codec(webrtc.DefaultPayloadTypeVP8, 1))