zishuo/webrtc
1
0
Fork 0
mirror of https://github.com/pion/webrtc.git synced 2025-10-25 00:00:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename media.Writer AddPacket -> WriteRTP

Browse Source 
Makes the name consistent with webrtc's WriteRTP
and makes webrtc.Track a Writer.

Fixes #566
This commit is contained in:
Max Hawkins
2019-03-29 19:42:14 -07:00
committed by Sean DuBois
parent 4298892dc0
commit 2a9d654143
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/janus-gateway/streaming/main.go
View File

@@ -24,7 +24,7 @@ func saveToDisk(i media.Writer, track *webrtc.Track) {
panic(err) panic(err)
} }
if err := i.AddPacket(packet); err != nil { if err := i.WriteRTP(packet); err != nil {
panic(err) panic(err)
} }
} }

2
examples/save-to-disk/main.go
View File

@@ -26,7 +26,7 @@ func saveToDisk(i media.Writer, track *webrtc.Track) {
if err != nil { if err != nil {
panic(err) panic(err)
} }
if err := i.AddPacket(rtpPacket); err != nil { if err := i.WriteRTP(rtpPacket); err != nil {
panic(err) panic(err)
} }
} }

4
pkg/media/ivfwriter/ivfwriter.go
View File

@@ -64,8 +64,8 @@ func (i *IVFWriter) writeHeader() error {
return err return err
} }
// AddPacket adds a new packet and writes the appropriate headers for it // WriteRTP adds a new packet and writes the appropriate headers for it
func (i *IVFWriter) AddPacket(packet *rtp.Packet) error { func (i *IVFWriter) WriteRTP(packet *rtp.Packet) error {
if i.stream == nil { if i.stream == nil {
return fmt.Errorf("file not opened") return fmt.Errorf("file not opened")
} }

2
pkg/media/ivfwriter/ivfwriter_test.go
View File

@@ -113,7 +113,7 @@ func TestIVFWriter_AddPacketAndClose(t *testing.T) {
for _, t := range addPacketTestCase { for _, t := range addPacketTestCase {
if t.writer != nil { if t.writer != nil {
res := t.writer.AddPacket(t.packet) res := t.writer.WriteRTP(t.packet)
assert.Equal(res, t.err, t.message) assert.Equal(res, t.err, t.message)
} }
} }

2
pkg/media/media.go
View File

@@ -14,7 +14,7 @@ type Sample struct {
// the creation of media files // the creation of media files
type Writer interface { type Writer interface {
// Add the content of an RTP packet to the media // Add the content of an RTP packet to the media
AddPacket(packet *rtp.Packet) error WriteRTP(packet *rtp.Packet) error
// Close the media // Close the media
// Note: Close implementation must be idempotent // Note: Close implementation must be idempotent
Close() error Close() error

4
pkg/media/opuswriter/opuswriter.go
View File

@@ -140,8 +140,8 @@ func (i *OpusWriter) createPage(payload []uint8, headerType uint8, granulePos ui
return page return page
} }
// AddPacket adds a new packet and writes the appropriate headers for it // WriteRTP adds a new packet and writes the appropriate headers for it
func (i *OpusWriter) AddPacket(packet *rtp.Packet) error { func (i *OpusWriter) WriteRTP(packet *rtp.Packet) error {
if i.stream == nil { if i.stream == nil {
return fmt.Errorf("file not opened") return fmt.Errorf("file not opened")
} }

2
pkg/media/opuswriter/opuswriter_test.go
View File

@@ -112,7 +112,7 @@ func TestOpusWriter_AddPacketAndClose(t *testing.T) {
for _, t := range addPacketTestCase { for _, t := range addPacketTestCase {
if t.writer != nil { if t.writer != nil {
res := t.writer.AddPacket(t.packet) res := t.writer.WriteRTP(t.packet)
assert.Equal(t.err, res, t.message) assert.Equal(t.err, res, t.message)
} }
} }