mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Creating the files I need for repacketisation

This commit is contained in:
Unknown 2017-12-11 15:24:49 +10:30
parent bc7962b240
commit 24658ed1aa
4 changed files with 113 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packet/MpegTs.go Normal file
View File

@ -0,0 +1,6 @@
package packet
type MpegTsPacket struct {
}

20
packet/RtpToTsConverter.go Normal file
View File

@ -0,0 +1,20 @@
package packet
type RtpToTsConverter interface {
New() *rtpToTsConverter
}
type rtpToTsConverter struct {
TsOutChan <-chan MpegTsPacket
RtpInChan chan<- RtpPacket
}
func New() c *rtpToTsConverter {
c = new(rtpToTsConverter)
c.TsOutChan = make(chan, MpegTsPacket)
c.RtpInChan = make(chan, RtpPacket)
}
func (c* RtpToTsConverter) convert() {
}

17
rtp/rtp.go → packet/rtp.go
View File

@ -29,11 +29,11 @@ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISE
OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package rtp
package packet
import (
"net"
"fmt"
"net"
)
const (
@ -43,12 +43,14 @@ const (
const (
hasRtpPadding = 1 << 5
hasRtpExt = 1 << 4
hasMarker = 1 << 7
)
type RtpPacket struct {
Version byte
Padding bool
Ext bool
CC byte
Marker bool
PayloadType byte
SequenceNumber uint
@ -122,23 +124,22 @@ func (s *Session) HandleRtcpConn(conn net.PacketConn) {
func (s *Session) handleRtp(buf []byte) {
fmt.Println(buf)
packet := RtpPacket{
Version: (buf[0] & 0xC0)>>6,
Version: (buf[0] & 0xC0) >> 6,
Padding: buf[0]&hasRtpPadding != 0,
Ext: buf[0]&hasRtpExt != 0,
Marker: buf[1]&1 != 0,
PayloadType: buf[1] >> 1,
CC: buf[0] & 0x0F,
Marker: buf[1]&hasMarker != 0,
PayloadType: buf[1] & 0x7F,
SequenceNumber: toUint(buf[2:4]),
Timestamp: toUint(buf[4:8]),
SyncSource: toUint(buf[8:12]),
CSRC: make([]uint, buf[0]>>4),
CSRC: make([]uint, buf[0]&0x0F),
}
if packet.Version != RTP_VERSION {
fmt.Printf("Packet version: %v", packet.Version)
panic("Unsupported version")
}
i := 12
for j := range packet.CSRC {

81
revid/repacketTest.go
View File

@ -9,7 +9,7 @@ import (
"net"
"time"
"../rtp"
"../packet"
"github.com/beatgammit/rtsp"
)
@ -18,20 +18,6 @@ func init() {
flag.Parse()
}
const sampleRequest = `OPTIONS rtsp://example.com/media.mp4 RTSP/1.0
CSeq: 1
Require: implicit-play
Proxy-Require: gzipped-messages
`
const sampleResponse = `RTSP/1.0 200 OK
CSeq: 1
Public: DESCRIBE, SETUP, TEARDOWN, PLAY, PAUSE
`
func main() {
if len(flag.Args()) >= 1 {
rtspUrl := flag.Args()[0]
@ -74,52 +60,45 @@ func main() {
log.Println(res)
// create udp connection for rtp stuff
rtpLaddr, err := net.ResolveUDPAddr("udp","192.168.0.109:17300")
if err != nil {fmt.Println("Local rtp addr not set!")}
rtpAddr, err := net.ResolveUDPAddr("udp","192.168.0.50:17300")
if err != nil { fmt.Println( "Resolving rtp address didn't work!")}
rtpConn, err := net.DialUDP("udp",rtpLaddr,rtpAddr)
if err != nil {fmt.Println("Rtp dial didn't work!")}
rtpLaddr, err := net.ResolveUDPAddr("udp", "192.168.0.109:17300")
if err != nil {
fmt.Println("Local rtp addr not set!")
}
rtpAddr, err := net.ResolveUDPAddr("udp", "192.168.0.50:17300")
if err != nil {
fmt.Println("Resolving rtp address didn't work!")
}
rtpConn, err := net.DialUDP("udp", rtpLaddr, rtpAddr)
if err != nil {
fmt.Println("Rtp dial didn't work!")
}
// Create udp connection for rtcp stuff
rtcpLaddr, err := net.ResolveUDPAddr("udp","192.168.0.109:17319")
if err != nil {fmt.Println("Local ")}
rtcpAddr, err := net.ResolveUDPAddr("udp","192.168.0.50:17301")
if err != nil {fmt.Println("resolving rtcp address didn't work!")}
rtcpConn, err := net.DialUDP("udp",rtcpLaddr, rtcpAddr)
if err != nil {fmt.Println("Rtcp dial didnt't work!")}
rtcpLaddr, err := net.ResolveUDPAddr("udp", "192.168.0.109:17319")
if err != nil {
fmt.Println("Local ")
}
rtcpAddr, err := net.ResolveUDPAddr("udp", "192.168.0.50:17301")
if err != nil {
fmt.Println("resolving rtcp address didn't work!")
}
rtcpConn, err := net.DialUDP("udp", rtcpLaddr, rtcpAddr)
if err != nil {
fmt.Println("Rtcp dial didnt't work!")
}
// let's create a session that will store useful stuff from the connections
rtpSession := rtp.New(rtpConn,rtcpConn)
rtpSession := rtp.New(rtpConn, rtcpConn)
// Loop here until we get something in the channels
for{
for {
fmt.Printf("Length of rtpChan: %v\n", len(rtpSession.RtpChan))
time.Sleep(1*time.Second )
select{
time.Sleep(1 * time.Second)
select {
case rtpPacket := <-rtpSession.RtpChan:
fmt.Println(rtpPacket)
default:
}
}
} else {
r, err := rtsp.ReadRequest(bytes.NewBufferString(sampleRequest))
if err != nil {
fmt.Println(err)
} else {
fmt.Println(r)
}
res, err := rtsp.ReadResponse(bytes.NewBufferString(sampleResponse))
if err != nil {
fmt.Println(err)
} else {
fmt.Println(res)
}
}
}