kunmeng/vdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opus work in progress

Browse Source
This commit is contained in:
Andrey Semochkin
2021-01-09 07:37:19 +03:00
parent 4bf0059477
commit 6a92c34cd4
5 changed files with 85 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
format/webrtcv3/adapter.go
View File

@@ -14,23 +14,6 @@ import (
"github.com/pion/webrtc/v3/pkg/media"
)
const (
// MimeTypeH264 H264 MIME type.
MimeTypeH264 = "video/h264"
// MimeTypeOpus Opus MIME type
MimeTypeOpus = "audio/opus"
// MimeTypeVP8 VP8 MIME type
MimeTypeVP8 = "video/vp8"
// MimeTypeVP9 VP9 MIME type
MimeTypeVP9 = "video/vp9"
// MimeTypeG722 G722 MIME type
MimeTypeG722 = "audio/G722"
// MimeTypePCMU PCMU MIME type
MimeTypePCMU = "audio/PCMU"
// MimeTypePCMA PCMA MIME type
MimeTypePCMA = "audio/PCMA"
)
var (
ErrorNotFound = errors.New("WebRTC Stream Not Found")
ErrorCodecNotSupported = errors.New("WebRTC Codec Not Supported")
@@ -99,18 +82,22 @@ func (element *Muxer) WriteHeader(streams []av.CodecData, sdp64 string) (string,
}
}
} else if i2.Type().IsAudio() {
AudioCodecString := MimeTypePCMU
AudioCodecString := webrtc.MimeTypePCMA
switch i2.Type() {
case av.PCM_ALAW:
AudioCodecString = MimeTypePCMA
AudioCodecString = webrtc.MimeTypePCMA
case av.PCM_MULAW:
AudioCodecString = MimeTypePCMU
AudioCodecString = webrtc.MimeTypePCMU
case av.OPUS:
AudioCodecString = webrtc.MimeTypeOpus
default:
log.Println(ErrorIgnoreAudioTrack)
continue
}
track, err = webrtc.NewTrackLocalStaticSample(webrtc.RTPCodecCapability{
MimeType: AudioCodecString,
MimeType: AudioCodecString,
Channels: uint16(i2.(av.AudioCodecData).ChannelLayout().Count()),
ClockRate: uint32(i2.(av.AudioCodecData).SampleRate()),
}, "pion-rtsp-audio", "pion-rtsp-audio")
if err != nil {
return "", err
@@ -162,6 +149,7 @@ func (element *Muxer) WriteHeader(streams []av.CodecData, sdp64 string) (string,
}
func (element *Muxer) WritePacket(pkt av.Packet) (err error) {
//log.Println("WritePacket", pkt.Time, element.stop, webrtc.ICEConnectionStateConnected, pkt.Idx, element.streams[pkt.Idx])
var WritePacketSuccess bool
defer func() {
if !WritePacketSuccess {
@@ -189,6 +177,7 @@ func (element *Muxer) WritePacket(pkt av.Packet) (err error) {
}
case av.PCM_MULAW:
case av.PCM_ALAW:
case av.OPUS:
default:
return ErrorCodecNotSupported
}