package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-04 23:02:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename medias.Format into medias.FindFormat

Browse Source
This commit is contained in:
aler9
2022-12-12 00:16:25 +01:00
parent 46cbb885b7
commit a50247956f
14 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ func main() {
// find the G711 media and format // find the G711 media and format
var trak *format.G711 var trak *format.G711
medi := medias.Find(&trak) medi := medias.FindFormat(&trak)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")
} }

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

@@ -38,7 +38,7 @@ func main() {
// find the G722 media and format // find the G722 media and format
var trak *format.G722 var trak *format.G722
medi := medias.Find(&trak) medi := medias.FindFormat(&trak)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")
} }

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

@@ -64,7 +64,7 @@ func main() {
// find the H264 media and format // find the H264 media and format
var trak *format.H264 var trak *format.H264
medi := medias.Find(&trak) medi := medias.FindFormat(&trak)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")
} }

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

@@ -36,7 +36,7 @@ func main() {
// find the H264 media and format // find the H264 media and format
var trak *format.H264 var trak *format.H264
medi := medias.Find(&trak) medi := medias.FindFormat(&trak)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")
} }

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

@@ -41,7 +41,7 @@ func main() {
// find the H264 media and format // find the H264 media and format
var trak *format.H264 var trak *format.H264
medi := medias.Find(&trak) medi := medias.FindFormat(&trak)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")
} }

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

@@ -38,7 +38,7 @@ func main() {
// find the H265 media and format // find the H265 media and format
var trak *format.H265 var trak *format.H265
medi := medias.Find(&trak) medi := medias.FindFormat(&trak)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")
} }

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

@@ -38,7 +38,7 @@ func main() {
// find the LPCM media and format // find the LPCM media and format
var trak *format.LPCM var trak *format.LPCM
medi := medias.Find(&trak) medi := medias.FindFormat(&trak)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")
} }

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

@@ -38,7 +38,7 @@ func main() {
// find the MPEG4-audio media and format // find the MPEG4-audio media and format
var trak *format.MPEG4Audio var trak *format.MPEG4Audio
medi := medias.Find(&trak) medi := medias.FindFormat(&trak)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")
} }

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

@@ -38,7 +38,7 @@ func main() {
// find the Opus media and format // find the Opus media and format
var trak *format.Opus var trak *format.Opus
medi := medias.Find(&trak) medi := medias.FindFormat(&trak)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")
} }

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

@@ -38,7 +38,7 @@ func main() {
// find the VP8 media and format // find the VP8 media and format
var trak *format.VP8 var trak *format.VP8
medi := medias.Find(&trak) medi := medias.FindFormat(&trak)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")
} }

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

@@ -38,7 +38,7 @@ func main() {
// find the VP9 media and format // find the VP9 media and format
var trak *format.VP9 var trak *format.VP9
medi := medias.Find(&trak) medi := medias.FindFormat(&trak)
if medi == nil { if medi == nil {
panic("media not found") panic("media not found")
} }

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

@@ -68,7 +68,7 @@ func (sh *serverHandler) OnAnnounce(ctx *gortsplib.ServerHandlerOnAnnounceCtx) (
// find the H264 media and format // find the H264 media and format
var trak *format.H264 var trak *format.H264
medi := ctx.Medias.Find(&trak) medi := ctx.Medias.FindFormat(&trak)
if medi == nil { if medi == nil {
return &base.Response{ return &base.Response{
StatusCode: base.StatusBadRequest, StatusCode: base.StatusBadRequest,

4
pkg/media/medias.go
View File

@@ -89,9 +89,9 @@ func (ms Medias) SetControls() {
} }
} }
// Find finds a certain format among all the formats in all the medias. // FindFormat finds a certain format among all the formats in all the medias.
// If the format is found, it is inserted into trak, and format media is returned. // If the format is found, it is inserted into trak, and format media is returned.
func (ms *Medias) Find(trak interface{}) *Media { func (ms *Medias) FindFormat(trak interface{}) *Media {
for _, media := range *ms { for _, media := range *ms {
for _, trakk := range media.Formats { for _, trakk := range media.Formats {
if reflect.TypeOf(trakk) == reflect.TypeOf(trak).Elem() { if reflect.TypeOf(trakk) == reflect.TypeOf(trak).Elem() {

4
pkg/media/medias_test.go
View File

@@ -446,7 +446,7 @@ func TestMediasMarshal(t *testing.T) {
} }
} }
func TestMediasFind(t *testing.T) { func TestMediasFindFormat(t *testing.T) {
tr := &format.Generic{ tr := &format.Generic{
PayloadTyp: 97, PayloadTyp: 97,
RTPMap: "rtx/90000", RTPMap: "rtx/90000",
@@ -482,7 +482,7 @@ func TestMediasFind(t *testing.T) {
} }
var trak *format.Generic var trak *format.Generic
me := ms.Find(&trak) me := ms.FindFormat(&trak)
require.Equal(t, md, me) require.Equal(t, md, me)
require.Equal(t, tr, trak) require.Equal(t, tr, trak)
} }