diff --git a/examples/client-read-format-g711/main.go b/examples/client-read-format-g711/main.go index cb8cf0f0..e1e4a881 100644 --- a/examples/client-read-format-g711/main.go +++ b/examples/client-read-format-g711/main.go @@ -38,7 +38,7 @@ func main() { // find the G711 media and format var trak *format.G711 - medi := medias.Find(&trak) + medi := medias.FindFormat(&trak) if medi == nil { panic("media not found") } diff --git a/examples/client-read-format-g722/main.go b/examples/client-read-format-g722/main.go index 1d9e32c4..748d4712 100644 --- a/examples/client-read-format-g722/main.go +++ b/examples/client-read-format-g722/main.go @@ -38,7 +38,7 @@ func main() { // find the G722 media and format var trak *format.G722 - medi := medias.Find(&trak) + medi := medias.FindFormat(&trak) if medi == nil { panic("media not found") } diff --git a/examples/client-read-format-h264-convert-to-jpeg/main.go b/examples/client-read-format-h264-convert-to-jpeg/main.go index b341c97b..e92c7eba 100644 --- a/examples/client-read-format-h264-convert-to-jpeg/main.go +++ b/examples/client-read-format-h264-convert-to-jpeg/main.go @@ -64,7 +64,7 @@ func main() { // find the H264 media and format var trak *format.H264 - medi := medias.Find(&trak) + medi := medias.FindFormat(&trak) if medi == nil { panic("media not found") } diff --git a/examples/client-read-format-h264-save-to-disk/main.go b/examples/client-read-format-h264-save-to-disk/main.go index e5f0648b..a9994540 100644 --- a/examples/client-read-format-h264-save-to-disk/main.go +++ b/examples/client-read-format-h264-save-to-disk/main.go @@ -36,7 +36,7 @@ func main() { // find the H264 media and format var trak *format.H264 - medi := medias.Find(&trak) + medi := medias.FindFormat(&trak) if medi == nil { panic("media not found") } diff --git a/examples/client-read-format-h264/main.go b/examples/client-read-format-h264/main.go index 0bfb0b18..111930a7 100644 --- a/examples/client-read-format-h264/main.go +++ b/examples/client-read-format-h264/main.go @@ -41,7 +41,7 @@ func main() { // find the H264 media and format var trak *format.H264 - medi := medias.Find(&trak) + medi := medias.FindFormat(&trak) if medi == nil { panic("media not found") } diff --git a/examples/client-read-format-h265/main.go b/examples/client-read-format-h265/main.go index d9ae0690..1a0f4251 100644 --- a/examples/client-read-format-h265/main.go +++ b/examples/client-read-format-h265/main.go @@ -38,7 +38,7 @@ func main() { // find the H265 media and format var trak *format.H265 - medi := medias.Find(&trak) + medi := medias.FindFormat(&trak) if medi == nil { panic("media not found") } diff --git a/examples/client-read-format-lpcm/main.go b/examples/client-read-format-lpcm/main.go index fc0caf1c..b0afe894 100644 --- a/examples/client-read-format-lpcm/main.go +++ b/examples/client-read-format-lpcm/main.go @@ -38,7 +38,7 @@ func main() { // find the LPCM media and format var trak *format.LPCM - medi := medias.Find(&trak) + medi := medias.FindFormat(&trak) if medi == nil { panic("media not found") } diff --git a/examples/client-read-format-mpeg4audio/main.go b/examples/client-read-format-mpeg4audio/main.go index 0b18f118..c9c26267 100644 --- a/examples/client-read-format-mpeg4audio/main.go +++ b/examples/client-read-format-mpeg4audio/main.go @@ -38,7 +38,7 @@ func main() { // find the MPEG4-audio media and format var trak *format.MPEG4Audio - medi := medias.Find(&trak) + medi := medias.FindFormat(&trak) if medi == nil { panic("media not found") } diff --git a/examples/client-read-format-opus/main.go b/examples/client-read-format-opus/main.go index 2d596e17..71b08d33 100644 --- a/examples/client-read-format-opus/main.go +++ b/examples/client-read-format-opus/main.go @@ -38,7 +38,7 @@ func main() { // find the Opus media and format var trak *format.Opus - medi := medias.Find(&trak) + medi := medias.FindFormat(&trak) if medi == nil { panic("media not found") } diff --git a/examples/client-read-format-vp8/main.go b/examples/client-read-format-vp8/main.go index 08331a80..2c979907 100644 --- a/examples/client-read-format-vp8/main.go +++ b/examples/client-read-format-vp8/main.go @@ -38,7 +38,7 @@ func main() { // find the VP8 media and format var trak *format.VP8 - medi := medias.Find(&trak) + medi := medias.FindFormat(&trak) if medi == nil { panic("media not found") } diff --git a/examples/client-read-format-vp9/main.go b/examples/client-read-format-vp9/main.go index ad04a38f..5093eeb5 100644 --- a/examples/client-read-format-vp9/main.go +++ b/examples/client-read-format-vp9/main.go @@ -38,7 +38,7 @@ func main() { // find the VP9 media and format var trak *format.VP9 - medi := medias.Find(&trak) + medi := medias.FindFormat(&trak) if medi == nil { panic("media not found") } diff --git a/examples/server-h264-save-to-disk/main.go b/examples/server-h264-save-to-disk/main.go index e3c3bcf4..4da0d370 100644 --- a/examples/server-h264-save-to-disk/main.go +++ b/examples/server-h264-save-to-disk/main.go @@ -68,7 +68,7 @@ func (sh *serverHandler) OnAnnounce(ctx *gortsplib.ServerHandlerOnAnnounceCtx) ( // find the H264 media and format var trak *format.H264 - medi := ctx.Medias.Find(&trak) + medi := ctx.Medias.FindFormat(&trak) if medi == nil { return &base.Response{ StatusCode: base.StatusBadRequest, diff --git a/pkg/media/medias.go b/pkg/media/medias.go index a9304edc..53757e6a 100644 --- a/pkg/media/medias.go +++ b/pkg/media/medias.go @@ -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. -func (ms *Medias) Find(trak interface{}) *Media { +func (ms *Medias) FindFormat(trak interface{}) *Media { for _, media := range *ms { for _, trakk := range media.Formats { if reflect.TypeOf(trakk) == reflect.TypeOf(trak).Elem() { diff --git a/pkg/media/medias_test.go b/pkg/media/medias_test.go index 2dc240dc..c9ebd50c 100644 --- a/pkg/media/medias_test.go +++ b/pkg/media/medias_test.go @@ -446,7 +446,7 @@ func TestMediasMarshal(t *testing.T) { } } -func TestMediasFind(t *testing.T) { +func TestMediasFindFormat(t *testing.T) { tr := &format.Generic{ PayloadTyp: 97, RTPMap: "rtx/90000", @@ -482,7 +482,7 @@ func TestMediasFind(t *testing.T) { } var trak *format.Generic - me := ms.Find(&trak) + me := ms.FindFormat(&trak) require.Equal(t, md, me) require.Equal(t, tr, trak) }