Skip to content

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
Former-commit-id: c1b04561ea2e5c039546342afc3d62e6e289438b [formerly 32a6e80a040842ba0e726e8ad05f189f4d7aec46] [formerly 73a051606af3c159c29e092e4dac7a4454599e51 [formerly f76000c]]
Former-commit-id: 0f6641f1065ff16f6a65637b3cc33083d1ac7cc6 [formerly a700b3efcd332e6a85dca7d64213dc8fe40a9a27]
Former-commit-id: 912f499a441189b2afe2792a0f1934d90bb73f18
  • Loading branch information
notedit committed Jan 9, 2020
1 parent 25be63c commit 91084ee
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 13 deletions.
3 changes: 0 additions & 3 deletions incomingstream.go
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,6 @@ func (i *IncomingStream) CreateTrack(track *sdp.TrackInfo) *IncomingStreamTrack
// Append to soruces with empty rid
sources[""] = source

runtime.SetFinalizer(source, func(source native.RTPIncomingSourceGroup) {
i.transport.RemoveIncomingSourceGroup(source)
})
}

incomingTrack := NewIncomingStreamTrack(track.GetMedia(), track.GetID(), i.receiver, sources)
Expand Down
9 changes: 0 additions & 9 deletions transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package mediaserver

import (
"fmt"
"runtime"
"sync"

"github.com/gofrs/uuid"
Expand Down Expand Up @@ -460,10 +459,6 @@ func (t *Transport) CreateOutgoingStreamTrack(media string, trackId string, ssrc

outgoingTrack := newOutgoingStreamTrack(media, trackId, native.TransportToSender(t.transport), source)

runtime.SetFinalizer(source, func(source native.RTPOutgoingSourceGroup) {
t.transport.RemoveOutgoingSourceGroup(source)
})

for _, trackFunc := range t.onOutgoingTrackListeners {
trackFunc(outgoingTrack, nil)
}
Expand Down Expand Up @@ -526,10 +521,6 @@ func (t *Transport) CreateIncomingStreamTrack(media string, trackId string, ssrc

incomingTrack := NewIncomingStreamTrack(media, trackId, native.TransportToReceiver(t.transport), sources)

runtime.SetFinalizer(source, func(source native.RTPIncomingSourceGroup) {
t.transport.RemoveIncomingSourceGroup(source)
})

for _, trackFunc := range t.onIncomingTrackListeners {
trackFunc(incomingTrack, nil)
}
Expand Down
1 change: 0 additions & 1 deletion transport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ func Test_TransportCreateStream(t *testing.T) {

fmt.Println(incoming)

//incoming.Stop()
transport.Stop()

}
1 change: 1 addition & 0 deletions wrapper/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ package native
#cgo CPPFLAGS: -I${SRCDIR}/../include/media-server/src/
#cgo LDFLAGS: -L/usr/local/lib -lmediaserver -lssl -lcrypto -lsrtp2
#cgo LDFLAGS: /usr/local/lib/libmp4v2.a
#cgo LDFLAGS: /usr/local/lib/libsrtp2.a
#cgo LDFLAGS: -ldl
*/
import "C"

0 comments on commit 91084ee

Please sign in to comment.