Ugh

stream.go

@@ -89,7 +89,7 @@ func (s *Stream) ServeChunk(w http.ResponseWriter, id int) error {
 
 	// Will have this soon enough
 	foundBehind := false
-	for i := id - 1; i > id-4 && i >= 0; i++ {
+	for i := id - 1; i > id-4 && i >= 0; i-- {
 		if _, ok := s.chunks[i]; ok {
 			foundBehind = true
 		}
@@ -168,6 +168,12 @@ func (s *Stream) waitForChunk(w http.ResponseWriter, chunk *Chunk) {
 }
 
 func (s *Stream) restartAtChunk(w http.ResponseWriter, id int) {
+	// Stop current transcoder
+	if s.coder != nil {
+		s.coder.Process.Kill()
+		s.coder.Wait()
+	}
+
 	// Clear everything
 	s.chunks = make(map[int]*Chunk)
 
@@ -288,10 +294,18 @@ func (s *Stream) getTsPath(id int) string {
 
 // Separate goroutine
 func (s *Stream) monitorTranscodeOutput(cmdStdOut io.ReadCloser, startAt float64) {
+	s.mutex.Lock()
+	coder := s.coder
+	s.mutex.Unlock()
+
 	defer cmdStdOut.Close()
 	stdoutReader := bufio.NewReader(cmdStdOut)
 
 	for {
+		if s.coder != coder {
+			break
+		}
+
 		line, err := stdoutReader.ReadBytes('\n')
 		if err == io.EOF {
 			if len(line) == 0 {
@@ -307,23 +321,36 @@ func (s *Stream) monitorTranscodeOutput(cmdStdOut io.ReadCloser, startAt float64
 		l := string(line)
 
 		if strings.Contains(l, ".ts") {
-			// 1080p-000003.ts
+			go func() {
-			idx := strings.Split(strings.Split(l, "-")[1], ".")[0]
+				// 1080p-000003.ts
-			id, err := strconv.Atoi(idx)
+				idx := strings.Split(strings.Split(l, "-")[1], ".")[0]
-			if err != nil {
+				id, err := strconv.Atoi(idx)
-				log.Println("Error parsing chunk id")
+				if err != nil {
-			}
+					log.Println("Error parsing chunk id")
+				}
 
-			s.mutex.Lock()
+				s.mutex.Lock()
-			chunk := s.createChunk(id)
+				defer s.mutex.Unlock()
-			chunk.done = true
+
-			for _, n := range chunk.notifs {
+				if s.coder != coder {
-				n <- true
+					return
-			}
+				}
-			s.mutex.Unlock()
+
+				chunk := s.createChunk(id)
+				chunk.done = true
+				for _, n := range chunk.notifs {
+					n <- true
+				}
+			}()
 		}
 
-		// log.Println("ffmpeg:", l)
+		log.Println("ffmpeg:", l)
+	}
+
+	// Join the process
+	err := s.coder.Wait()
+	if err != nil {
+		log.Println("FFmpeg process wait failed with", err)
 	}
 }