merge format and formatdecenc into formats (#222)

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

View File

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