package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-05 15:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge format and formatdecenc into formats (#222)

Browse Source
This commit is contained in:
Alessandro Ros
2023-04-01 13:23:16 +02:00
committed by GitHub
parent 03b96abf84
commit af3ed2bd83
161 changed files with 217 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/bluenviron/gortsplib/v3/pkg/base" "github.com/bluenviron/gortsplib/v3/pkg/base"
"github.com/bluenviron/gortsplib/v3/pkg/bytecounter" "github.com/bluenviron/gortsplib/v3/pkg/bytecounter"
"github.com/bluenviron/gortsplib/v3/pkg/conn" "github.com/bluenviron/gortsplib/v3/pkg/conn"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/headers" "github.com/bluenviron/gortsplib/v3/pkg/headers"
"github.com/bluenviron/gortsplib/v3/pkg/liberrors" "github.com/bluenviron/gortsplib/v3/pkg/liberrors"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
@@ -1642,7 +1642,7 @@ func (c *Client) Seek(ra *headers.Range) (*base.Response, error) {
} }
// OnPacketRTPAny sets the callback that is called when a RTP packet is read from any setupped media. // OnPacketRTPAny sets the callback that is called when a RTP packet is read from any setupped media.
func (c *Client) OnPacketRTPAny(cb func(*media.Media, format.Format, *rtp.Packet)) { func (c *Client) OnPacketRTPAny(cb func(*media.Media, formats.Format, *rtp.Packet)) {
for _, cm := range c.medias { for _, cm := range c.medias {
cmedia := cm.media cmedia := cm.media
for _, forma := range cm.media.Formats { for _, forma := range cm.media.Formats {
@@ -1664,7 +1664,7 @@ func (c *Client) OnPacketRTCPAny(cb func(*media.Media, rtcp.Packet)) {
} }
// OnPacketRTP sets the callback that is called when a RTP packet is read. // OnPacketRTP sets the callback that is called when a RTP packet is read.
func (c *Client) OnPacketRTP(medi *media.Media, forma format.Format, cb func(*rtp.Packet)) { func (c *Client) OnPacketRTP(medi *media.Media, forma formats.Format, cb func(*rtp.Packet)) {
cm := c.medias[medi] cm := c.medias[medi]
ct := cm.formats[forma.PayloadType()] ct := cm.formats[forma.PayloadType()]
ct.onPacketRTP = cb ct.onPacketRTP = cb

6
client_format.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/pion/rtcp" "github.com/pion/rtcp"
"github.com/pion/rtp" "github.com/pion/rtp"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/rtcpreceiver" "github.com/bluenviron/gortsplib/v3/pkg/rtcpreceiver"
"github.com/bluenviron/gortsplib/v3/pkg/rtcpsender" "github.com/bluenviron/gortsplib/v3/pkg/rtcpsender"
"github.com/bluenviron/gortsplib/v3/pkg/rtpreorderer" "github.com/bluenviron/gortsplib/v3/pkg/rtpreorderer"
@@ -15,14 +15,14 @@ import (
type clientFormat struct { type clientFormat struct {
c *Client c *Client
cm *clientMedia cm *clientMedia
format format.Format format formats.Format
udpReorderer *rtpreorderer.Reorderer // play udpReorderer *rtpreorderer.Reorderer // play
udpRTCPReceiver *rtcpreceiver.RTCPReceiver // play udpRTCPReceiver *rtcpreceiver.RTCPReceiver // play
rtcpSender *rtcpsender.RTCPSender // record rtcpSender *rtcpsender.RTCPSender // record
onPacketRTP func(*rtp.Packet) onPacketRTP func(*rtp.Packet)
} }
func newClientFormat(cm *clientMedia, forma format.Format) *clientFormat { func newClientFormat(cm *clientMedia, forma formats.Format) *clientFormat {
return &clientFormat{ return &clientFormat{
c: cm.c, c: cm.c,
cm: cm, cm: cm,

44
client_play_test.go
View File

@@ -20,7 +20,7 @@ import (
"github.com/bluenviron/gortsplib/v3/pkg/base" "github.com/bluenviron/gortsplib/v3/pkg/base"
"github.com/bluenviron/gortsplib/v3/pkg/codecs/mpeg4audio" "github.com/bluenviron/gortsplib/v3/pkg/codecs/mpeg4audio"
"github.com/bluenviron/gortsplib/v3/pkg/conn" "github.com/bluenviron/gortsplib/v3/pkg/conn"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/headers" "github.com/bluenviron/gortsplib/v3/pkg/headers"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
@@ -35,7 +35,7 @@ func mustMarshalMedias(medias media.Medias) []byte {
return byts return byts
} }
func readAll(c *Client, ur string, cb func(*media.Media, format.Format, *rtp.Packet)) error { func readAll(c *Client, ur string, cb func(*media.Media, formats.Format, *rtp.Packet)) error {
u, err := url.Parse(ur) u, err := url.Parse(ur)
if err != nil { if err != nil {
return err return err
@@ -76,7 +76,7 @@ func TestClientPlayFormats(t *testing.T) {
media2 := &media.Media{ media2 := &media.Media{
Type: media.TypeAudio, Type: media.TypeAudio,
Formats: []format.Format{&format.MPEG4Audio{ Formats: []formats.Format{&formats.MPEG4Audio{
PayloadTyp: 96, PayloadTyp: 96,
Config: &mpeg4audio.Config{ Config: &mpeg4audio.Config{
Type: mpeg4audio.ObjectTypeAACLC, Type: mpeg4audio.ObjectTypeAACLC,
@@ -91,7 +91,7 @@ func TestClientPlayFormats(t *testing.T) {
media3 := &media.Media{ media3 := &media.Media{
Type: media.TypeAudio, Type: media.TypeAudio,
Formats: []format.Format{&format.MPEG4Audio{ Formats: []formats.Format{&formats.MPEG4Audio{
PayloadTyp: 96, PayloadTyp: 96,
Config: &mpeg4audio.Config{ Config: &mpeg4audio.Config{
Type: mpeg4audio.ObjectTypeAACLC, Type: mpeg4audio.ObjectTypeAACLC,
@@ -268,7 +268,7 @@ func TestClientPlay(t *testing.T) {
require.Equal(t, base.Describe, req.Method) require.Equal(t, base.Describe, req.Method)
require.Equal(t, mustParseURL(scheme+"://"+listenIP+":8554/test/stream?param=value"), req.URL) require.Equal(t, mustParseURL(scheme+"://"+listenIP+":8554/test/stream?param=value"), req.URL)
forma := &format.Generic{ forma := &formats.Generic{
PayloadTyp: 96, PayloadTyp: 96,
RTPMap: "private/90000", RTPMap: "private/90000",
} }
@@ -278,11 +278,11 @@ func TestClientPlay(t *testing.T) {
medias := media.Medias{ medias := media.Medias{
&media.Media{ &media.Media{
Type: "application", Type: "application",
Formats: []format.Format{forma}, Formats: []formats.Format{forma},
}, },
&media.Media{ &media.Media{
Type: "application", Type: "application",
Formats: []format.Format{forma}, Formats: []formats.Format{forma},
}, },
} }
medias.SetControls() medias.SetControls()
@@ -491,7 +491,7 @@ func TestClientPlay(t *testing.T) {
err = c.SetupAll(medias, baseURL) err = c.SetupAll(medias, baseURL)
require.NoError(t, err) require.NoError(t, err)
c.OnPacketRTPAny(func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { c.OnPacketRTPAny(func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
require.Equal(t, &testRTPPacket, pkt) require.Equal(t, &testRTPPacket, pkt)
err := c.WritePacketRTCP(medi, &testRTCPPacket) err := c.WritePacketRTCP(medi, &testRTCPPacket)
require.NoError(t, err) require.NoError(t, err)
@@ -542,7 +542,7 @@ func TestClientPlayPartial(t *testing.T) {
require.Equal(t, base.Describe, req.Method) require.Equal(t, base.Describe, req.Method)
require.Equal(t, mustParseURL("rtsp://"+listenIP+":8554/teststream"), req.URL) require.Equal(t, mustParseURL("rtsp://"+listenIP+":8554/teststream"), req.URL)
forma := &format.Generic{ forma := &formats.Generic{
PayloadTyp: 96, PayloadTyp: 96,
RTPMap: "private/90000", RTPMap: "private/90000",
} }
@@ -552,11 +552,11 @@ func TestClientPlayPartial(t *testing.T) {
medias := media.Medias{ medias := media.Medias{
&media.Media{ &media.Media{
Type: "application", Type: "application",
Formats: []format.Format{forma}, Formats: []formats.Format{forma},
}, },
&media.Media{ &media.Media{
Type: "application", Type: "application",
Formats: []format.Format{forma}, Formats: []formats.Format{forma},
}, },
} }
medias.SetControls() medias.SetControls()
@@ -647,7 +647,7 @@ func TestClientPlayPartial(t *testing.T) {
_, err = c.Setup(medias[1], baseURL, 0, 0) _, err = c.Setup(medias[1], baseURL, 0, 0)
require.NoError(t, err) require.NoError(t, err)
c.OnPacketRTPAny(func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { c.OnPacketRTPAny(func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
require.Equal(t, medias[1], medi) require.Equal(t, medias[1], medi)
require.Equal(t, medias[1].Formats[0], forma) require.Equal(t, medias[1].Formats[0], forma)
require.Equal(t, &testRTPPacket, pkt) require.Equal(t, &testRTPPacket, pkt)
@@ -931,7 +931,7 @@ func TestClientPlayAnyPort(t *testing.T) {
var med *media.Media var med *media.Media
err = readAll(&c, "rtsp://localhost:8554/teststream", err = readAll(&c, "rtsp://localhost:8554/teststream",
func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
require.Equal(t, &testRTPPacket, pkt) require.Equal(t, &testRTPPacket, pkt)
med = medi med = medi
close(packetRecv) close(packetRecv)
@@ -1055,7 +1055,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) {
}, },
} }
err = readAll(&c, "rtsp://localhost:8554/teststream", err = readAll(&c, "rtsp://localhost:8554/teststream",
func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
close(packetRecv) close(packetRecv)
}) })
require.NoError(t, err) require.NoError(t, err)
@@ -1231,7 +1231,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) {
}, },
} }
err = readAll(&c, "rtsp://localhost:8554/teststream", err = readAll(&c, "rtsp://localhost:8554/teststream",
func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
close(packetRecv) close(packetRecv)
}) })
require.NoError(t, err) require.NoError(t, err)
@@ -1467,7 +1467,7 @@ func TestClientPlayAutomaticProtocol(t *testing.T) {
} }
err = readAll(&c, "rtsp://myuser:mypass@localhost:8554/teststream", err = readAll(&c, "rtsp://myuser:mypass@localhost:8554/teststream",
func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
close(packetRecv) close(packetRecv)
}) })
require.NoError(t, err) require.NoError(t, err)
@@ -1589,7 +1589,7 @@ func TestClientPlayDifferentInterleavedIDs(t *testing.T) {
} }
err = readAll(&c, "rtsp://localhost:8554/teststream", err = readAll(&c, "rtsp://localhost:8554/teststream",
func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
close(packetRecv) close(packetRecv)
}) })
require.NoError(t, err) require.NoError(t, err)
@@ -1776,7 +1776,7 @@ func TestClientPlayRedirect(t *testing.T) {
ru = "rtsp://testusr:testpwd@localhost:8554/path1" ru = "rtsp://testusr:testpwd@localhost:8554/path1"
} }
err = readAll(&c, ru, err = readAll(&c, ru,
func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
close(packetRecv) close(packetRecv)
}) })
require.NoError(t, err) require.NoError(t, err)
@@ -1976,7 +1976,7 @@ func TestClientPlayPause(t *testing.T) {
} }
err = readAll(&c, "rtsp://localhost:8554/teststream", err = readAll(&c, "rtsp://localhost:8554/teststream",
func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
if atomic.SwapInt32(&firstFrame, 1) == 0 { if atomic.SwapInt32(&firstFrame, 1) == 0 {
close(packetRecv) close(packetRecv)
} }
@@ -2440,7 +2440,7 @@ func TestClientPlayIgnoreTCPInvalidMedia(t *testing.T) {
} }
err = readAll(&c, "rtsp://localhost:8554/teststream", err = readAll(&c, "rtsp://localhost:8554/teststream",
func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
close(recv) close(recv)
}) })
require.NoError(t, err) require.NoError(t, err)
@@ -2858,7 +2858,7 @@ func TestClientPlayDifferentSource(t *testing.T) {
} }
err = readAll(&c, "rtsp://localhost:8554/test/stream?param=value", err = readAll(&c, "rtsp://localhost:8554/test/stream?param=value",
func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
require.Equal(t, &testRTPPacket, pkt) require.Equal(t, &testRTPPacket, pkt)
close(packetRecv) close(packetRecv)
}) })
@@ -2920,7 +2920,7 @@ func TestClientPlayDecodeErrors(t *testing.T) {
medias := media.Medias{&media.Media{ medias := media.Medias{&media.Media{
Type: media.TypeApplication, Type: media.TypeApplication,
Formats: []format.Format{&format.Generic{ Formats: []formats.Format{&formats.Generic{
PayloadTyp: 97, PayloadTyp: 97,
RTPMap: "private/90000", RTPMap: "private/90000",
}}, }},

4
client_record_test.go
View File

@@ -15,7 +15,7 @@ import (
"github.com/bluenviron/gortsplib/v3/pkg/base" "github.com/bluenviron/gortsplib/v3/pkg/base"
"github.com/bluenviron/gortsplib/v3/pkg/conn" "github.com/bluenviron/gortsplib/v3/pkg/conn"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/headers" "github.com/bluenviron/gortsplib/v3/pkg/headers"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/bluenviron/gortsplib/v3/pkg/sdp" "github.com/bluenviron/gortsplib/v3/pkg/sdp"
@@ -24,7 +24,7 @@ import (
var testH264Media = &media.Media{ var testH264Media = &media.Media{
Type: media.TypeVideo, Type: media.TypeVideo,
Formats: []format.Format{&format.H264{ Formats: []formats.Format{&formats.H264{
PayloadTyp: 96, PayloadTyp: 96,
SPS: []byte{0x01, 0x02, 0x03, 0x04}, SPS: []byte{0x01, 0x02, 0x03, 0x04},
PPS: []byte{0x01, 0x02, 0x03, 0x04}, PPS: []byte{0x01, 0x02, 0x03, 0x04},

4
examples/client-publish-format-g711/main.go
View File

@@ -5,7 +5,7 @@ import (
"net" "net"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -38,7 +38,7 @@ func main() {
// create a media that contains a G711 format // create a media that contains a G711 format
medi := &media.Media{ medi := &media.Media{
Type: media.TypeAudio, Type: media.TypeAudio,
Formats: []format.Format{&format.G711{}}, Formats: []formats.Format{&formats.G711{}},
} }
c := gortsplib.Client{} c := gortsplib.Client{}

4
examples/client-publish-format-g722/main.go
View File

@@ -5,7 +5,7 @@ import (
"net" "net"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -38,7 +38,7 @@ func main() {
// create a media that contains a G722 format // create a media that contains a G722 format
medi := &media.Media{ medi := &media.Media{
Type: media.TypeAudio, Type: media.TypeAudio,
Formats: []format.Format{&format.G722{}}, Formats: []formats.Format{&formats.G722{}},
} }
c := gortsplib.Client{} c := gortsplib.Client{}

4
examples/client-publish-format-h264/main.go
View File

@@ -5,7 +5,7 @@ import (
"net" "net"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -39,7 +39,7 @@ func main() {
// create a media that contains a H264 format // create a media that contains a H264 format
medi := &media.Media{ medi := &media.Media{
Type: media.TypeVideo, Type: media.TypeVideo,
Formats: []format.Format{&format.H264{ Formats: []formats.Format{&formats.H264{
PayloadTyp: 96, PayloadTyp: 96,
PacketizationMode: 1, PacketizationMode: 1,
}}, }},

4
examples/client-publish-format-h265/main.go
View File

@@ -5,7 +5,7 @@ import (
"net" "net"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -39,7 +39,7 @@ func main() {
// create a media that contains a H265 format // create a media that contains a H265 format
medi := &media.Media{ medi := &media.Media{
Type: media.TypeVideo, Type: media.TypeVideo,
Formats: []format.Format{&format.H265{ Formats: []formats.Format{&formats.H265{
PayloadTyp: 96, PayloadTyp: 96,
}}, }},
} }

4
examples/client-publish-format-lpcm/main.go
View File

@@ -5,7 +5,7 @@ import (
"net" "net"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -38,7 +38,7 @@ func main() {
// create a media that contains a LPCM format // create a media that contains a LPCM format
medi := &media.Media{ medi := &media.Media{
Type: media.TypeAudio, Type: media.TypeAudio,
Formats: []format.Format{&format.LPCM{ Formats: []formats.Format{&formats.LPCM{
PayloadTyp: 96, PayloadTyp: 96,
BitDepth: 16, BitDepth: 16,
SampleRate: 44100, SampleRate: 44100,

4
examples/client-publish-format-mjpeg/main.go
View File

@@ -5,7 +5,7 @@ import (
"net" "net"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -38,7 +38,7 @@ func main() {
// create a media that contains a M-JPEG format // create a media that contains a M-JPEG format
medi := &media.Media{ medi := &media.Media{
Type: media.TypeVideo, Type: media.TypeVideo,
Formats: []format.Format{&format.MJPEG{}}, Formats: []formats.Format{&formats.MJPEG{}},
} }
// connect to the server and start recording the media // connect to the server and start recording the media

4
examples/client-publish-format-mpeg4audio/main.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/codecs/mpeg4audio" "github.com/bluenviron/gortsplib/v3/pkg/codecs/mpeg4audio"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -39,7 +39,7 @@ func main() {
// create a media that contains a MPEG4-audio format // create a media that contains a MPEG4-audio format
medi := &media.Media{ medi := &media.Media{
Type: media.TypeAudio, Type: media.TypeAudio,
Formats: []format.Format{&format.MPEG4Audio{ Formats: []formats.Format{&formats.MPEG4Audio{
PayloadTyp: 96, PayloadTyp: 96,
Config: &mpeg4audio.Config{ Config: &mpeg4audio.Config{
Type: mpeg4audio.ObjectTypeAACLC, Type: mpeg4audio.ObjectTypeAACLC,

4
examples/client-publish-format-opus/main.go
View File

@@ -5,7 +5,7 @@ import (
"net" "net"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -38,7 +38,7 @@ func main() {
// create a media that contains a Opus format // create a media that contains a Opus format
medi := &media.Media{ medi := &media.Media{
Type: media.TypeAudio, Type: media.TypeAudio,
Formats: []format.Format{&format.Opus{ Formats: []formats.Format{&formats.Opus{
PayloadTyp: 96, PayloadTyp: 96,
IsStereo: false, IsStereo: false,
}}, }},

4
examples/client-publish-format-vp8/main.go
View File

@@ -5,7 +5,7 @@ import (
"net" "net"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -39,7 +39,7 @@ func main() {
// create a media that contains a VP8 format // create a media that contains a VP8 format
medi := &media.Media{ medi := &media.Media{
Type: media.TypeVideo, Type: media.TypeVideo,
Formats: []format.Format{&format.VP8{ Formats: []formats.Format{&formats.VP8{
PayloadTyp: 96, PayloadTyp: 96,
}}, }},
} }

4
examples/client-publish-format-vp9/main.go
View File

@@ -5,7 +5,7 @@ import (
"net" "net"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -39,7 +39,7 @@ func main() {
// create a media that contains a VP9 format // create a media that contains a VP9 format
medi := &media.Media{ medi := &media.Media{
Type: media.TypeVideo, Type: media.TypeVideo,
Formats: []format.Format{&format.VP9{ Formats: []formats.Format{&formats.VP9{
PayloadTyp: 96, PayloadTyp: 96,
}}, }},
} }

4
examples/client-publish-options/main.go
View File

@@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -40,7 +40,7 @@ func main() {
// create a media that contains a H264 media // create a media that contains a H264 media
medi := &media.Media{ medi := &media.Media{
Type: media.TypeVideo, Type: media.TypeVideo,
Formats: []format.Format{&format.H264{ Formats: []formats.Format{&formats.H264{
PayloadTyp: 96, PayloadTyp: 96,
PacketizationMode: 1, PacketizationMode: 1,
}}, }},

4
examples/client-publish-pause/main.go
View File

@@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -41,7 +41,7 @@ func main() {
// create a media that contains a H264 format // create a media that contains a H264 format
medi := &media.Media{ medi := &media.Media{
Type: media.TypeVideo, Type: media.TypeVideo,
Formats: []format.Format{&format.H264{ Formats: []formats.Format{&formats.H264{
PayloadTyp: 96, PayloadTyp: 96,
PacketizationMode: 1, PacketizationMode: 1,
}}, }},

4
examples/client-read-format-g711/main.go
View File

@@ -4,7 +4,7 @@ import (
"log" "log"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -37,7 +37,7 @@ func main() {
} }
// find the G711 media and format // find the G711 media and format
var forma *format.G711 var forma *formats.G711
medi := medias.FindFormat(&forma) medi := medias.FindFormat(&forma)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")

4
examples/client-read-format-g722/main.go
View File

@@ -4,7 +4,7 @@ import (
"log" "log"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -37,7 +37,7 @@ func main() {
} }
// find the G722 media and format // find the G722 media and format
var forma *format.G722 var forma *formats.G722
medi := medias.FindFormat(&forma) medi := medias.FindFormat(&forma)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")

6
examples/client-read-format-h264-convert-to-jpeg/main.go
View File

@@ -9,8 +9,8 @@ import (
"time" "time"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtph264" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtph264"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -64,7 +64,7 @@ func main() {
} }
// find the H264 media and format // find the H264 media and format
var forma *format.H264 var forma *formats.H264
medi := medias.FindFormat(&forma) medi := medias.FindFormat(&forma)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")

6
examples/client-read-format-h264-save-to-disk/main.go
View File

@@ -4,8 +4,8 @@ import (
"log" "log"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtph264" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtph264"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -38,7 +38,7 @@ func main() {
} }
// find the H264 media and format // find the H264 media and format
var forma *format.H264 var forma *formats.H264
medi := medias.FindFormat(&forma) medi := medias.FindFormat(&forma)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")

6
examples/client-read-format-h264/main.go
View File

@@ -4,8 +4,8 @@ import (
"log" "log"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtph264" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtph264"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -41,7 +41,7 @@ func main() {
} }
// find the H264 media and format // find the H264 media and format
var forma *format.H264 var forma *formats.H264
medi := medias.FindFormat(&forma) medi := medias.FindFormat(&forma)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")

6
examples/client-read-format-h265/main.go
View File

@@ -4,8 +4,8 @@ import (
"log" "log"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtph265" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtph265"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -38,7 +38,7 @@ func main() {
} }
// find the H265 media and format // find the H265 media and format
var forma *format.H265 var forma *formats.H265
medi := medias.FindFormat(&forma) medi := medias.FindFormat(&forma)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")

4
examples/client-read-format-lpcm/main.go
View File

@@ -4,7 +4,7 @@ import (
"log" "log"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -37,7 +37,7 @@ func main() {
} }
// find the LPCM media and format // find the LPCM media and format
var forma *format.LPCM var forma *formats.LPCM
medi := medias.FindFormat(&forma) medi := medias.FindFormat(&forma)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")

6
examples/client-read-format-mjpeg/main.go
View File

@@ -6,8 +6,8 @@ import (
"log" "log"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtpmjpeg" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpmjpeg"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -41,7 +41,7 @@ func main() {
} }
// find the M-JPEG media and format // find the M-JPEG media and format
var forma *format.MJPEG var forma *formats.MJPEG
medi := medias.FindFormat(&forma) medi := medias.FindFormat(&forma)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")

4
examples/client-read-format-mpeg4audio/main.go
View File

@@ -4,7 +4,7 @@ import (
"log" "log"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -37,7 +37,7 @@ func main() {
} }
// find the MPEG4-audio media and format // find the MPEG4-audio media and format
var forma *format.MPEG4Audio var forma *formats.MPEG4Audio
medi := medias.FindFormat(&forma) medi := medias.FindFormat(&forma)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")

4
examples/client-read-format-opus/main.go
View File

@@ -4,7 +4,7 @@ import (
"log" "log"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -37,7 +37,7 @@ func main() {
} }
// find the Opus media and format // find the Opus media and format
var forma *format.Opus var forma *formats.Opus
medi := medias.FindFormat(&forma) medi := medias.FindFormat(&forma)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")

6
examples/client-read-format-vp8/main.go
View File

@@ -4,8 +4,8 @@ import (
"log" "log"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtpvp8" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpvp8"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -38,7 +38,7 @@ func main() {
} }
// find the VP8 media and format // find the VP8 media and format
var forma *format.VP8 var forma *formats.VP8
medi := medias.FindFormat(&forma) medi := medias.FindFormat(&forma)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")

6
examples/client-read-format-vp9/main.go
View File

@@ -4,8 +4,8 @@ import (
"log" "log"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtpvp9" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpvp9"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
) )
@@ -38,7 +38,7 @@ func main() {
} }
// find the VP9 media and format // find the VP9 media and format
var forma *format.VP9 var forma *formats.VP9
medi := medias.FindFormat(&forma) medi := medias.FindFormat(&forma)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")

4
examples/client-read-options/main.go
View File

@@ -5,7 +5,7 @@ import (
"time" "time"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtcp" "github.com/pion/rtcp"
@@ -53,7 +53,7 @@ func main() {
} }
// called when a RTP packet arrives // called when a RTP packet arrives
c.OnPacketRTPAny(func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { c.OnPacketRTPAny(func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
log.Printf("RTP packet from media %v\n", medi) log.Printf("RTP packet from media %v\n", medi)
}) })

4
examples/client-read-pause/main.go
View File

@@ -5,7 +5,7 @@ import (
"time" "time"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtcp" "github.com/pion/rtcp"
@@ -47,7 +47,7 @@ func main() {
} }
// called when a RTP packet arrives // called when a RTP packet arrives
c.OnPacketRTPAny(func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { c.OnPacketRTPAny(func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
log.Printf("RTP packet from media %v\n", medi) log.Printf("RTP packet from media %v\n", medi)
}) })

4
examples/client-read-republish/main.go
View File

@@ -4,7 +4,7 @@ import (
"log" "log"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
@@ -54,7 +54,7 @@ func main() {
defer publisher.Close() defer publisher.Close()
// read RTP packets from the reader and route them to the publisher // read RTP packets from the reader and route them to the publisher
reader.OnPacketRTPAny(func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { reader.OnPacketRTPAny(func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
publisher.WritePacketRTP(medi, pkt) publisher.WritePacketRTP(medi, pkt)
}) })

4
examples/client-read/main.go
View File

@@ -4,7 +4,7 @@ import (
"log" "log"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtcp" "github.com/pion/rtcp"
@@ -44,7 +44,7 @@ func main() {
} }
// called when a RTP packet arrives // called when a RTP packet arrives
c.OnPacketRTPAny(func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { c.OnPacketRTPAny(func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
log.Printf("RTP packet from media %v\n", medi) log.Printf("RTP packet from media %v\n", medi)
}) })

4
examples/proxy/client.go
View File

@@ -6,7 +6,7 @@ import (
"time" "time"
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
"github.com/bluenviron/gortsplib/v3/pkg/url" "github.com/bluenviron/gortsplib/v3/pkg/url"
"github.com/pion/rtp" "github.com/pion/rtp"
@@ -93,7 +93,7 @@ func (c *client) read() error {
}() }()
// called when a RTP packet arrives // called when a RTP packet arrives
rc.OnPacketRTPAny(func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { rc.OnPacketRTPAny(func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
// route incoming packets to the server stream // route incoming packets to the server stream
stream.WritePacketRTP(medi, pkt) stream.WritePacketRTP(medi, pkt)
}) })

8
examples/server-h264-save-to-disk/main.go
View File

@@ -9,8 +9,8 @@ import (
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/base" "github.com/bluenviron/gortsplib/v3/pkg/base"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtph264" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtph264"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
) )
@@ -23,7 +23,7 @@ type serverHandler struct {
mutex sync.Mutex mutex sync.Mutex
publisher *gortsplib.ServerSession publisher *gortsplib.ServerSession
media *media.Media media *media.Media
format *format.H264 format *formats.H264
rtpDec *rtph264.Decoder rtpDec *rtph264.Decoder
mpegtsMuxer *mpegtsMuxer mpegtsMuxer *mpegtsMuxer
} }
@@ -67,7 +67,7 @@ func (sh *serverHandler) OnAnnounce(ctx *gortsplib.ServerHandlerOnAnnounceCtx) (
} }
// find the H264 media and format // find the H264 media and format
var forma *format.H264 var forma *formats.H264
medi := ctx.Medias.FindFormat(&forma) medi := ctx.Medias.FindFormat(&forma)
if medi == nil { if medi == nil {
return &base.Response{ return &base.Response{

4
examples/server-tls/main.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/base" "github.com/bluenviron/gortsplib/v3/pkg/base"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
) )
@@ -126,7 +126,7 @@ func (sh *serverHandler) OnRecord(ctx *gortsplib.ServerHandlerOnRecordCtx) (*bas
log.Printf("record request") log.Printf("record request")
// called when receiving a RTP packet // called when receiving a RTP packet
ctx.Session.OnPacketRTPAny(func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { ctx.Session.OnPacketRTPAny(func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
// route the RTP packet to all readers // route the RTP packet to all readers
sh.stream.WritePacketRTP(medi, pkt) sh.stream.WritePacketRTP(medi, pkt)
}) })

4
examples/server/main.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/base" "github.com/bluenviron/gortsplib/v3/pkg/base"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
) )
@@ -125,7 +125,7 @@ func (sh *serverHandler) OnRecord(ctx *gortsplib.ServerHandlerOnRecordCtx) (*bas
log.Printf("record request") log.Printf("record request")
// called when receiving a RTP packet // called when receiving a RTP packet
ctx.Session.OnPacketRTPAny(func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { ctx.Session.OnPacketRTPAny(func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
// route the RTP packet to all readers // route the RTP packet to all readers
sh.stream.WritePacketRTP(medi, pkt) sh.stream.WritePacketRTP(medi, pkt)
}) })

4
internal/highleveltests/server_test.go
View File

@@ -19,7 +19,7 @@ import (
"github.com/bluenviron/gortsplib/v3" "github.com/bluenviron/gortsplib/v3"
"github.com/bluenviron/gortsplib/v3/pkg/base" "github.com/bluenviron/gortsplib/v3/pkg/base"
"github.com/bluenviron/gortsplib/v3/pkg/format" "github.com/bluenviron/gortsplib/v3/pkg/formats"
"github.com/bluenviron/gortsplib/v3/pkg/media" "github.com/bluenviron/gortsplib/v3/pkg/media"
) )
@@ -385,7 +385,7 @@ func TestServerRecordRead(t *testing.T) {
}, fmt.Errorf("invalid query (%s)", ctx.Query) }, fmt.Errorf("invalid query (%s)", ctx.Query)
} }
ctx.Session.OnPacketRTPAny(func(medi *media.Media, forma format.Format, pkt *rtp.Packet) { ctx.Session.OnPacketRTPAny(func(medi *media.Media, forma formats.Format, pkt *rtp.Packet) {
stream.WritePacketRTP(medi, pkt) stream.WritePacketRTP(medi, pkt)
}) })

2
pkg/formatdecenc/formatdecenc.go
View File

@@ -1,2 +0,0 @@
// Package formatdecenc contains decoders and encoders to decode and encode RTP packets.
package formatdecenc

4
pkg/format/format.go → pkg/formats/format.go
View File

@@ -1,5 +1,5 @@
// Package format contains format definitions. // Package formats contains RTP format definitions, decoders and encoders.
package format package formats
import ( import (
"strconv" "strconv"

2
pkg/format/format_test.go → pkg/formats/format_test.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"testing" "testing"

4
pkg/format/g711.go → pkg/formats/g711.go
View File

@@ -1,9 +1,9 @@
package format package formats
import ( import (
"github.com/pion/rtp" "github.com/pion/rtp"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtpsimpleaudio" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpsimpleaudio"
) )
// G711 is a format that uses the G711 codec, encoded with mu-law or A-law. // G711 is a format that uses the G711 codec, encoded with mu-law or A-law.

2
pkg/format/g711_test.go → pkg/formats/g711_test.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"testing" "testing"

4
pkg/format/g722.go → pkg/formats/g722.go
View File

@@ -1,9 +1,9 @@
package format package formats
import ( import (
"github.com/pion/rtp" "github.com/pion/rtp"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtpsimpleaudio" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpsimpleaudio"
) )
// G722 is a format that uses the G722 codec. // G722 is a format that uses the G722 codec.

2
pkg/format/g722_test.go → pkg/formats/g722_test.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"testing" "testing"

2
pkg/format/generic.go → pkg/formats/generic.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"fmt" "fmt"

2
pkg/format/generic_test.go → pkg/formats/generic_test.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"testing" "testing"

4
pkg/format/h264.go → pkg/formats/h264.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"encoding/base64" "encoding/base64"
@@ -11,7 +11,7 @@ import (
"github.com/pion/rtp" "github.com/pion/rtp"
"github.com/bluenviron/gortsplib/v3/pkg/codecs/h264" "github.com/bluenviron/gortsplib/v3/pkg/codecs/h264"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtph264" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtph264"
) )
// check whether a RTP/H264 packet contains a IDR, without decoding the packet. // check whether a RTP/H264 packet contains a IDR, without decoding the packet.

2
pkg/format/h264_test.go → pkg/formats/h264_test.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"testing" "testing"

4
pkg/format/h265.go → pkg/formats/h265.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"encoding/base64" "encoding/base64"
@@ -8,7 +8,7 @@ import (
"github.com/pion/rtp" "github.com/pion/rtp"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtph265" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtph265"
) )
// H265 is a format that uses the H265 codec. // H265 is a format that uses the H265 codec.

2
pkg/format/h265_test.go → pkg/formats/h265_test.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"testing" "testing"

4
pkg/format/lpcm.go → pkg/formats/lpcm.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"strconv" "strconv"
@@ -6,7 +6,7 @@ import (
"github.com/pion/rtp" "github.com/pion/rtp"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtplpcm" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtplpcm"
) )
// LPCM is a format that uses the uncompressed, Linear PCM codec. // LPCM is a format that uses the uncompressed, Linear PCM codec.

2
pkg/format/lpcm_test.go → pkg/formats/lpcm_test.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"fmt" "fmt"

4
pkg/format/mjpeg.go → pkg/formats/mjpeg.go
View File

@@ -1,9 +1,9 @@
package format package formats
import ( import (
"github.com/pion/rtp" "github.com/pion/rtp"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtpmjpeg" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpmjpeg"
) )
// MJPEG is a format that uses the Motion-JPEG codec. // MJPEG is a format that uses the Motion-JPEG codec.

2
pkg/format/mjpeg_test.go → pkg/formats/mjpeg_test.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"testing" "testing"

2
pkg/format/mpeg2_audio.go → pkg/formats/mpeg2_audio.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"github.com/pion/rtp" "github.com/pion/rtp"

2
pkg/format/mpeg2_audio_test.go → pkg/formats/mpeg2_audio_test.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"testing" "testing"

2
pkg/format/mpeg2_video.go → pkg/formats/mpeg2_video.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"github.com/pion/rtp" "github.com/pion/rtp"

2
pkg/format/mpeg2_video_test.go → pkg/formats/mpeg2_video_test.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"testing" "testing"

4
pkg/format/mpeg4_audio.go → pkg/formats/mpeg4_audio.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"encoding/hex" "encoding/hex"
@@ -8,7 +8,7 @@ import (
"github.com/pion/rtp" "github.com/pion/rtp"
"github.com/bluenviron/gortsplib/v3/pkg/codecs/mpeg4audio" "github.com/bluenviron/gortsplib/v3/pkg/codecs/mpeg4audio"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtpmpeg4audio" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpmpeg4audio"
) )
// MPEG4Audio is a format that uses a MPEG-4 audio codec. // MPEG4Audio is a format that uses a MPEG-4 audio codec.

2
pkg/format/mpeg4_audio_test.go → pkg/formats/mpeg4_audio_test.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"testing" "testing"

4
pkg/format/opus.go → pkg/formats/opus.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"fmt" "fmt"
@@ -7,7 +7,7 @@ import (
"github.com/pion/rtp" "github.com/pion/rtp"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtpsimpleaudio" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpsimpleaudio"
) )
// Opus is a format that uses the Opus codec. // Opus is a format that uses the Opus codec.

2
pkg/format/opus_test.go → pkg/formats/opus_test.go
View File

@@ -1,4 +1,4 @@
package format package formats
import ( import (
"testing" "testing"

0
pkg/formatdecenc/rtph264/decoder.go → pkg/formats/rtph264/decoder.go
View File

0
pkg/formatdecenc/rtph264/decoder_test.go → pkg/formats/rtph264/decoder_test.go
View File

0
pkg/formatdecenc/rtph264/encoder.go → pkg/formats/rtph264/encoder.go
View File

0
pkg/formatdecenc/rtph264/encoder_test.go → pkg/formats/rtph264/encoder_test.go
View File

0
pkg/formatdecenc/rtph264/rtph264.go → pkg/formats/rtph264/rtph264.go
View File

0
pkg/formatdecenc/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/048b606517c23baffac96520675af386f92f471f22f098caec184d581dd6292e → pkg/formats/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/048b606517c23baffac96520675af386f92f471f22f098caec184d581dd6292e vendored
View File

0
pkg/formatdecenc/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/17ec193e17dd91d1b2a621884383564489d9f873db1b015a693c79fb7c1c1a46 → pkg/formats/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/17ec193e17dd91d1b2a621884383564489d9f873db1b015a693c79fb7c1c1a46 vendored
View File

0
pkg/formatdecenc/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/55cc57e8de6f7821309a6444040480f3aa0128b6b6cd96325b7997ff47d5d29d → pkg/formats/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/55cc57e8de6f7821309a6444040480f3aa0128b6b6cd96325b7997ff47d5d29d vendored
View File

0
pkg/formatdecenc/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/c30437d5edf1393c2957896ca6c4e4d0467a50451fd1feb1cae249fdcbf25a5a → pkg/formats/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/c30437d5edf1393c2957896ca6c4e4d0467a50451fd1feb1cae249fdcbf25a5a vendored
View File

0
pkg/formatdecenc/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/c89423ac94e1743f63fb142431eed08c3b74e51a4e7b8ed44a1ba826ca6129d9 → pkg/formats/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/c89423ac94e1743f63fb142431eed08c3b74e51a4e7b8ed44a1ba826ca6129d9 vendored
View File

0
pkg/formatdecenc/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/caf81e9797b19c76c1fc4dbf537d4d81f389524539f402d13aa01f93a65ac7e9 → pkg/formats/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/caf81e9797b19c76c1fc4dbf537d4d81f389524539f402d13aa01f93a65ac7e9 vendored
View File

0
pkg/formatdecenc/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/f428976a5b2917c009d1f28d7a96e81095be8631f062798130aa7e6835b67b01 → pkg/formats/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/f428976a5b2917c009d1f28d7a96e81095be8631f062798130aa7e6835b67b01 vendored
View File

0
pkg/formatdecenc/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/fe107a097efccd5098d6b0147ef4b39f0e467f0257dbf8f8b2f256c235640a6e → pkg/formats/rtph264/testdata/fuzz/FuzzDecoderUnmarshal/fe107a097efccd5098d6b0147ef4b39f0e467f0257dbf8f8b2f256c235640a6e vendored
View File

0
pkg/formatdecenc/rtph265/decoder.go → pkg/formats/rtph265/decoder.go
View File

0
pkg/formatdecenc/rtph265/decoder_test.go → pkg/formats/rtph265/decoder_test.go
View File

0
pkg/formatdecenc/rtph265/encoder.go → pkg/formats/rtph265/encoder.go
View File

0
pkg/formatdecenc/rtph265/encoder_test.go → pkg/formats/rtph265/encoder_test.go
View File

0
pkg/formatdecenc/rtph265/rtph265.go → pkg/formats/rtph265/rtph265.go
View File

0
pkg/formatdecenc/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/353ba911ad2dc1916f0bb9eb5e553575e27c9a6662e86d265f55bd57d1746962 → pkg/formats/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/353ba911ad2dc1916f0bb9eb5e553575e27c9a6662e86d265f55bd57d1746962 vendored
View File

0
pkg/formatdecenc/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/6e0463cbdc2d559f2823538d2efee4a8b811c3ea02d2bd8e0f306d81382d5698 → pkg/formats/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/6e0463cbdc2d559f2823538d2efee4a8b811c3ea02d2bd8e0f306d81382d5698 vendored
View File

0
pkg/formatdecenc/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/95aa14d7ab02ec8b5c470dcc780587540caba1589c6a7ce702ff84edca9b3133 → pkg/formats/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/95aa14d7ab02ec8b5c470dcc780587540caba1589c6a7ce702ff84edca9b3133 vendored
View File

0
pkg/formatdecenc/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/c4389a565e8280502fc611cde347896b5d167806b2e49e22db23bed73deef75b → pkg/formats/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/c4389a565e8280502fc611cde347896b5d167806b2e49e22db23bed73deef75b vendored
View File

0
pkg/formatdecenc/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/caf81e9797b19c76c1fc4dbf537d4d81f389524539f402d13aa01f93a65ac7e9 → pkg/formats/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/caf81e9797b19c76c1fc4dbf537d4d81f389524539f402d13aa01f93a65ac7e9 vendored
View File

0
pkg/formatdecenc/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/cb84a08ac93f5772ee3ba0f0bcfde81c9cd71a403c69f893cebc8378c60af625 → pkg/formats/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/cb84a08ac93f5772ee3ba0f0bcfde81c9cd71a403c69f893cebc8378c60af625 vendored
View File

0
pkg/formatdecenc/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/e45ead12fae619dd0807aaf83341d58eca4d50fab6eefbe78953581a1a4df198 → pkg/formats/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/e45ead12fae619dd0807aaf83341d58eca4d50fab6eefbe78953581a1a4df198 vendored
View File

0
pkg/formatdecenc/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/eb4593a9592045ab0cf0b17a3f9f2754d6898ee465ec32d9e08392bcbab0a81a → pkg/formats/rtph265/testdata/fuzz/FuzzDecoderUnmarshal/eb4593a9592045ab0cf0b17a3f9f2754d6898ee465ec32d9e08392bcbab0a81a vendored
View File

0
pkg/formatdecenc/rtplpcm/decoder.go → pkg/formats/rtplpcm/decoder.go
View File

0
pkg/formatdecenc/rtplpcm/decoder_test.go → pkg/formats/rtplpcm/decoder_test.go
View File

0
pkg/formatdecenc/rtplpcm/encoder.go → pkg/formats/rtplpcm/encoder.go
View File

0
pkg/formatdecenc/rtplpcm/encoder_test.go → pkg/formats/rtplpcm/encoder_test.go
View File

0
pkg/formatdecenc/rtplpcm/rtplpcm.go → pkg/formats/rtplpcm/rtplpcm.go
View File

0
pkg/formatdecenc/rtplpcm/testdata/fuzz/FuzzDecoderUnmarshal/582528ddfad69eb57775199a43e0f9fd5c94bba343ce7bb6724d4ebafe311ed4 → pkg/formats/rtplpcm/testdata/fuzz/FuzzDecoderUnmarshal/582528ddfad69eb57775199a43e0f9fd5c94bba343ce7bb6724d4ebafe311ed4 vendored
View File

2
pkg/formatdecenc/rtpmjpeg/decoder.go → pkg/formats/rtpmjpeg/decoder.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/pion/rtp" "github.com/pion/rtp"
"github.com/bluenviron/gortsplib/v3/pkg/codecs/jpeg" "github.com/bluenviron/gortsplib/v3/pkg/codecs/jpeg"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtpmjpeg/headers" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpmjpeg/headers"
"github.com/bluenviron/gortsplib/v3/pkg/rtptime" "github.com/bluenviron/gortsplib/v3/pkg/rtptime"
) )

0
pkg/formatdecenc/rtpmjpeg/decoder_test.go → pkg/formats/rtpmjpeg/decoder_test.go
View File

2
pkg/formatdecenc/rtpmjpeg/encoder.go → pkg/formats/rtpmjpeg/encoder.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/pion/rtp" "github.com/pion/rtp"
"github.com/bluenviron/gortsplib/v3/pkg/codecs/jpeg" "github.com/bluenviron/gortsplib/v3/pkg/codecs/jpeg"
"github.com/bluenviron/gortsplib/v3/pkg/formatdecenc/rtpmjpeg/headers" "github.com/bluenviron/gortsplib/v3/pkg/formats/rtpmjpeg/headers"
"github.com/bluenviron/gortsplib/v3/pkg/rtptime" "github.com/bluenviron/gortsplib/v3/pkg/rtptime"
) )

0
pkg/formatdecenc/rtpmjpeg/encoder_test.go → pkg/formats/rtpmjpeg/encoder_test.go
View File

0
pkg/formatdecenc/rtpmjpeg/headers/headers.go → pkg/formats/rtpmjpeg/headers/headers.go
View File

0
pkg/formatdecenc/rtpmjpeg/headers/jpeg.go → pkg/formats/rtpmjpeg/headers/jpeg.go
View File

Some files were not shown because too many files have changed in this diff Show More