rename medias.Format into medias.FindFormat

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

View File

@@ -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")
}

View File

@@ -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")
}

View File

@@ -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")
}

View File

@@ -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")
}

View File

@@ -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")
}

View File

@@ -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")
}

View File

@@ -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")
}

View File

@@ -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")
}

View File

@@ -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")
}

View File

@@ -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")
}

View File

@@ -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")
}

View File

@@ -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,

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.
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() {

View File

@@ -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)
}