CEF/mediamtx
1
0
Fork 0
forked from External/mediamtx
Code Pull requests Activity

switch to gortsplib v2 (#1301)

Browse source 
Fixes #1103

gortsplib/v2 supports multiple formats inside a single track (media). This allows to apply the resizing algorithm to single formats inside medias.

For instance, if a media contains a a proprietary format and an H264 format, and the latter has oversized packets, they can now be resized.
This commit is contained in:
Alessandro Ros 2022-12-13 20:54:17 +01:00 • committed by GitHub
parent 074cfa6712
commit c778c049ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
65 changed files with 1195 additions and 1294 deletions
Download patch file Download diff file Expand all files Collapse all files

26
internal/core/source.go
View file

@ -4,7 +4,7 @@ import (
"fmt"
"strings"
"github.com/aler9/gortsplib"
"github.com/aler9/gortsplib/v2/pkg/media"
)
// source is an entity that can provide a stream.
@ -16,22 +16,30 @@ type source interface {
apiSourceDescribe() interface{}
}
func sourceTrackNames(tracks gortsplib.Tracks) []string {
ret := make([]string, len(tracks))
for i, t := range tracks {
ret[i] = t.String()
func mediaDescription(media *media.Media) string {
ret := make([]string, len(media.Formats))
for i, forma := range media.Formats {
ret[i] = forma.String()
}
return strings.Join(ret, "/")
}
func mediasDescription(medias media.Medias) []string {
ret := make([]string, len(medias))
for i, media := range medias {
ret[i] = mediaDescription(media)
}
return ret
}
func sourceTrackInfo(tracks gortsplib.Tracks) string {
func sourceMediaInfo(medias media.Medias) string {
return fmt.Sprintf("%d %s (%s)",
len(tracks),
len(medias),
func() string {
if len(tracks) == 1 {
if len(medias) == 1 {
return "track"
}
return "tracks"
}(),
strings.Join(sourceTrackNames(tracks), ", "))
strings.Join(mediasDescription(medias), ", "))
}