fix pcm
This commit is contained in:
parent
087a2b4c2d
commit
420338e0cc
@ -8,14 +8,6 @@ import (
|
|||||||
"encoding/binary"
|
"encoding/binary"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
|
||||||
"net"
|
|
||||||
"net/textproto"
|
|
||||||
"net/url"
|
|
||||||
"strconv"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/deepch/vdk/av"
|
"github.com/deepch/vdk/av"
|
||||||
"github.com/deepch/vdk/av/avutil"
|
"github.com/deepch/vdk/av/avutil"
|
||||||
"github.com/deepch/vdk/codec"
|
"github.com/deepch/vdk/codec"
|
||||||
@ -23,6 +15,14 @@ import (
|
|||||||
"github.com/deepch/vdk/codec/h264parser"
|
"github.com/deepch/vdk/codec/h264parser"
|
||||||
"github.com/deepch/vdk/format/rtsp/sdp"
|
"github.com/deepch/vdk/format/rtsp/sdp"
|
||||||
"github.com/deepch/vdk/utils/bits/pio"
|
"github.com/deepch/vdk/utils/bits/pio"
|
||||||
|
"io"
|
||||||
|
"log"
|
||||||
|
"net"
|
||||||
|
"net/textproto"
|
||||||
|
"net/url"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
var ErrCodecDataChange = fmt.Errorf("rtsp: codec data change, please call HandleCodecDataChange()")
|
var ErrCodecDataChange = fmt.Errorf("rtsp: codec data change, please call HandleCodecDataChange()")
|
||||||
@ -729,7 +729,6 @@ func (self *Stream) timeScale() int {
|
|||||||
|
|
||||||
func (self *Stream) makeCodecData() (err error) {
|
func (self *Stream) makeCodecData() (err error) {
|
||||||
media := self.Sdp
|
media := self.Sdp
|
||||||
|
|
||||||
if media.PayloadType >= 96 && media.PayloadType <= 127 {
|
if media.PayloadType >= 96 && media.PayloadType <= 127 {
|
||||||
switch media.Type {
|
switch media.Type {
|
||||||
case av.H264:
|
case av.H264:
|
||||||
@ -768,6 +767,8 @@ func (self *Stream) makeCodecData() (err error) {
|
|||||||
err = fmt.Errorf("rtsp: aac sdp config invalid: %s", err)
|
err = fmt.Errorf("rtsp: aac sdp config invalid: %s", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
default:
|
||||||
|
log.Fatalln("Fix Format may be raw PCM 97", media.PayloadType, media.Type)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
switch media.PayloadType {
|
switch media.PayloadType {
|
||||||
@ -782,7 +783,6 @@ func (self *Stream) makeCodecData() (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1110,7 +1110,6 @@ func (self *Client) Play() (err error) {
|
|||||||
if err = self.WriteRequest(req); err != nil {
|
if err = self.WriteRequest(req); err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if self.allCodecDataReady() {
|
if self.allCodecDataReady() {
|
||||||
self.stage = stageCodecDataDone
|
self.stage = stageCodecDataDone
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user