Merge pull request #3 from bigbluebutton/rtf2

file path in startRecordingResponse, flow status change updates, pion interceptors
bigbluebutton · Feb 27, 2023 · a077f9a · a077f9a
2 parents afeb0f5 + 67168b1
commit a077f9a
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -128,6 +128,7 @@ journalctl -u bbb-webrtc-recorder -f
     status: "ok" | "failed",
     error: undefined | <String>,
     sdp: <String | undefined>, // answer
+    fileName: <String | undefined>, // full path to recording
 }
 ```
 

diff --git a/internal/pubsub/events/events.go b/internal/pubsub/events/events.go
@@ -64,13 +64,14 @@ func (e *StartRecording) Fail(err error) *StartRecordingResponse {
 	return &r
 }
 
-func (e *StartRecording) Success(sdp string) *StartRecordingResponse {
+func (e *StartRecording) Success(sdp, fileName string) *StartRecordingResponse {
 	r := StartRecordingResponse{
 		Id:        "startRecordingResponse",
 		SessionId: e.SessionId,
 		Status:    "ok",
 		Error:     nil,
 		SDP:       pointer.ToString(sdp),
+		FileName:  pointer.ToString(fileName),
 	}
 	return &r
 }
@@ -84,6 +85,7 @@ startRecordingResponse (Recorder -> SFU)
 	status: ‘ok’ | ‘failed’,
 	error: undefined | <String>,
 	sdp: <String | undefined>, // answer
+	fileName: <String | undefined>, // full path to recording
 }
 ```
 */
@@ -94,6 +96,7 @@ type StartRecordingResponse struct {
 	Status    string  `json:"status,omitempty"`
 	Error     *string `json:"error,omitempty"`
 	SDP       *string `json:"sdp,omitempty"`
+	FileName  *string `json:"fileName,omitempty"`
 }
 
 /*

diff --git a/internal/server/server.go b/internal/server/server.go
@@ -81,9 +81,7 @@ func (s *Server) HandlePubSub(ctx context.Context, msg []byte) {
 				sess := NewSession(e.SessionId, s, wrtc, rec)
 				s.sessions.Store(e.SessionId, sess)
 				sdp = sess.StartRecording(e.SDP)
-				s.PublishPubSub(e.Success(sdp))
-				log.WithField("session", ctx.Value("session")).
-					Debug(sdp)
+				s.PublishPubSub(e.Success(sdp, rec.GetFilePath()))
 			}()
 			if err != nil {
 				log.WithField("session", ctx.Value("session")).

diff --git a/internal/webrtc/recorder/recorder.go b/internal/webrtc/recorder/recorder.go
@@ -16,6 +16,7 @@ import (
 type FlowCallbackFn func(isFlowing bool, keyframeSequence int64, videoTimestamp time.Duration, closed bool)
 
 type Recorder interface {
+	GetFilePath() string
 	Push(rtp *rtp.Packet, track *webrtc.TrackRemote)
 	SetContext(ctx context.Context)
 	Close() time.Duration

diff --git a/internal/webrtc/recorder/webm.go b/internal/webrtc/recorder/webm.go
@@ -59,7 +59,7 @@ func NewWebmRecorder(file string, fn FlowCallbackFn) *WebmRecorder {
 			case <-r.statusTickerChan:
 				return
 			case <-r.statusTicker.C:
-				if ts == r.videoTimestamp {
+				if ts == r.videoTimestamp && r.flowing {
 					r.flowing = false
 					r.flowCallbackFn(r.flowing, r.keyframeSequence, r.videoTimestamp, r.closed)
 				}
@@ -71,6 +71,10 @@ func NewWebmRecorder(file string, fn FlowCallbackFn) *WebmRecorder {
 	return r
 }
 
+func (r *WebmRecorder) GetFilePath() string {
+	return r.file
+}
+
 func (r *WebmRecorder) SetContext(ctx context.Context) {
 	r.ctx = ctx
 }
@@ -147,6 +151,7 @@ func (r *WebmRecorder) pushVP8(rtpPacket *rtp.Packet) {
 
 	var ts time.Duration
 	for {
+		flowing := r.flowing
 		sample := r.videoBuilder.Pop()
 		if sample == nil {
 			return
@@ -180,12 +185,14 @@ func (r *WebmRecorder) pushVP8(rtpPacket *rtp.Packet) {
 				panic(err)
 			}
 		}
+
 		if ts == r.videoTimestamp {
 			r.flowing = false
 		} else {
 			ts = r.videoTimestamp
+			r.flowing = true
 		}
-		if !r.flowing || videoKeyframe {
+		if r.flowing != flowing {
 			r.flowCallbackFn(r.flowing, r.keyframeSequence, r.videoTimestamp, r.closed)
 		}
 

diff --git a/internal/webrtc/webrtc.go b/internal/webrtc/webrtc.go
@@ -5,7 +5,9 @@ import (
 	"github.com/bigbluebutton/bbb-webrtc-recorder/internal/config"
 	"github.com/bigbluebutton/bbb-webrtc-recorder/internal/webrtc/recorder"
 	"github.com/bigbluebutton/bbb-webrtc-recorder/internal/webrtc/utils"
+	"github.com/pion/interceptor"
 	"github.com/pion/rtcp"
+	"github.com/pion/sdp/v3"
 	"github.com/pion/webrtc/v3"
 	log "github.com/sirupsen/logrus"
 	"io"
@@ -33,6 +35,12 @@ func (w WebRTC) Init(offer webrtc.SessionDescription, r recorder.Recorder, connS
 	// Create a MediaEngine object to configure the supported codec
 	m := &webrtc.MediaEngine{}
 
+	sdpOffer := sdp.SessionDescription{}
+
+	if err := sdpOffer.Unmarshal([]byte(offer.SDP)); err != nil {
+		panic(err)
+	}
+
 	// Setup the codecs you want to use.
 	// Only support VP8 and OPUS, this makes our WebM muxer code simpler
 	if err := m.RegisterCodec(webrtc.RTPCodecParameters{
@@ -50,10 +58,22 @@ func (w WebRTC) Init(offer webrtc.SessionDescription, r recorder.Recorder, connS
 
 	se := &webrtc.SettingEngine{}
 	se.SetSRTPReplayProtectionWindow(1024)
-	se.SetEphemeralUDPPortRange(w.cfg.RTCMinPort, w.cfg.RTCMaxPort)
+	if err := se.SetEphemeralUDPPortRange(w.cfg.RTCMinPort, w.cfg.RTCMaxPort); err != nil {
+		panic(err)
+	}
+
+	i := &interceptor.Registry{}
+	// Use the default set of Interceptors
+	if err := webrtc.RegisterDefaultInterceptors(m, i); err != nil {
+		panic(err)
+	}
 
 	// Create the API object with the MediaEngine
-	api := webrtc.NewAPI(webrtc.WithMediaEngine(m), webrtc.WithSettingEngine(*se))
+	api := webrtc.NewAPI(
+		webrtc.WithMediaEngine(m),
+		webrtc.WithSettingEngine(*se),
+		webrtc.WithInterceptorRegistry(i),
+	)
 
 	// Create a new RTCPeerConnection
 	peerConnection, err := api.NewPeerConnection(cfg)