Move RTPSender and RTPReceiver to API

Relates to #379
pion · Feb 21, 2019 · 9cff417 · 9cff417
1 parent 585f50e
commit 9cff417
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/peerconnection.go b/peerconnection.go
@@ -912,7 +912,7 @@ func (pc *PeerConnection) openSRTP() {
 
 	for i := range incomingSSRCes {
 		go func(ssrc uint32, codecType RTPCodecType) {
-			receiver := NewRTPReceiver(codecType, pc.dtlsTransport)
+			receiver := pc.api.NewRTPReceiver(codecType, pc.dtlsTransport)
 			<-receiver.Receive(RTPReceiveParameters{
 				encodings: RTPDecodingParameters{
 					RTPCodingParameters{SSRC: ssrc},
@@ -1129,7 +1129,7 @@ func (pc *PeerConnection) AddTrack(track *Track) (*RTPSender, error) {
 			return nil, err
 		}
 	} else {
-		sender := NewRTPSender(track, pc.dtlsTransport)
+		sender := pc.api.NewRTPSender(track, pc.dtlsTransport)
 		transceiver = pc.newRTPTransceiver(
 			nil,
 			sender,

diff --git a/rtpreceiver.go b/rtpreceiver.go
@@ -23,26 +23,31 @@ type RTPReceiver struct {
 
 	rtpOut        chan *rtp.Packet
 	rtpReadStream *srtp.ReadStreamSRTP
-	rtpOutDone    chan bool
+	rtpOutDone    chan struct{}
 
 	rtcpOut        chan rtcp.Packet
 	rtcpReadStream *srtp.ReadStreamSRTCP
-	rtcpOutDone    chan bool
+	rtcpOutDone    chan struct{}
+
+	// A reference to the associated api object
+	api *API
 }
 
 // NewRTPReceiver constructs a new RTPReceiver
-func NewRTPReceiver(kind RTPCodecType, transport *DTLSTransport) *RTPReceiver {
+func (api *API) NewRTPReceiver(kind RTPCodecType, transport *DTLSTransport) *RTPReceiver {
 	return &RTPReceiver{
 		kind:      kind,
 		transport: transport,
 
 		rtpOut:     make(chan *rtp.Packet, 15),
-		rtpOutDone: make(chan bool),
+		rtpOutDone: make(chan struct{}),
 
 		rtcpOut:     make(chan rtcp.Packet, 15),
-		rtcpOutDone: make(chan bool),
+		rtcpOutDone: make(chan struct{}),
 
 		hasRecv: make(chan bool),
+
+		api: api,
 	}
 }
 

diff --git a/rtpsender.go b/rtpsender.go
@@ -13,13 +13,17 @@ type RTPSender struct {
 	Track *Track
 
 	transport *DTLSTransport
+
+	// A reference to the associated api object
+	api *API
 }
 
 // NewRTPSender constructs a new RTPSender
-func NewRTPSender(track *Track, transport *DTLSTransport) *RTPSender {
+func (api *API) NewRTPSender(track *Track, transport *DTLSTransport) *RTPSender {
 	r := &RTPSender{
 		Track:     track,
 		transport: transport,
+		api:       api,
 	}
 
 	r.Track.sampleInput = make(chan media.Sample, 15) // Is the buffering needed?