RepoMirrors/mediamtx
1
0
Fork 0
mirror of https://github.com/bluenviron/mediamtx synced 2024-12-14 10:45:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

hls: stop spamming 'stream doesn't contain any supported codec' when hlsAlwaysRemux is true (#3018)

Browse Source
This commit is contained in:
Alessandro Ros 2024-02-13 23:36:40 +01:00 committed by GitHub
parent 1ae3240b91
commit ba69241377
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/servers/hls/muxer.go
View File

@ -153,7 +153,7 @@ func (m *muxer) runInner() error {
}
err = mi.initialize()
if err != nil {
if m.remoteAddr != "" {
if m.remoteAddr != "" || errors.Is(err, errNoSupportedCodecs) {
return err
}

7
internal/servers/hls/muxer_instance.go
View File

@ -1,6 +1,7 @@
package hls
import (
"errors"
"fmt"
"os"
"path/filepath"
@ -18,6 +19,9 @@ import (
"github.com/gin-gonic/gin"
)
var errNoSupportedCodecs = errors.New(
"the stream doesn't contain any supported codec, which are currently H265, H264, Opus, MPEG-4 Audio")
type muxerInstance struct {
variant conf.HLSVariant
segmentCount int
@ -43,8 +47,7 @@ func (mi *muxerInstance) initialize() error {
if videoTrack == nil && audioTrack == nil {
mi.stream.RemoveReader(mi.writer)
return fmt.Errorf(
"the stream doesn't contain any supported codec, which are currently H265, H264, Opus, MPEG-4 Audio")
return errNoSupportedCodecs
}
var muxerDirectory string

6
internal/servers/rtmp/conn.go
View File

@ -32,6 +32,9 @@ const (
pauseAfterAuthError = 2 * time.Second
)
var errNoSupportedCodecs = errors.New(
"the stream doesn't contain any supported codec, which are currently H264, MPEG-4 Audio, MPEG-1/2 Audio")
func pathNameAndQuery(inURL *url.URL) (string, url.Values, string) {
// remove leading and trailing slashes inserted by OBS and some other clients
tmp := strings.TrimRight(inURL.String(), "/")
@ -212,8 +215,7 @@ func (c *conn) runRead(conn *rtmp.Conn, u *url.URL) error {
writer)
if videoFormat == nil && audioFormat == nil {
return fmt.Errorf(
"the stream doesn't contain any supported codec, which are currently H264, MPEG-4 Audio, MPEG-1/2 Audio")
return errNoSupportedCodecs
}
c.Log(logger.Info, "is reading from path '%s', %s",

6
internal/servers/webrtc/session.go
View File

@ -32,6 +32,9 @@ import (
"github.com/bluenviron/mediamtx/internal/unit"
)
var errNoSupportedCodecs = errors.New(
"the stream doesn't contain any supported codec, which are currently AV1, VP9, VP8, H264, Opus, G722, G711")
type setupStreamFunc func(*webrtc.OutgoingTrack) error
func findVideoTrack(
@ -547,8 +550,7 @@ func (s *session) runRead() (int, error) {
audioTrack, audioSetup := findAudioTrack(stream, writer)
if videoTrack == nil && audioTrack == nil {
return http.StatusBadRequest, fmt.Errorf(
"the stream doesn't contain any supported codec, which are currently AV1, VP9, VP8, H264, Opus, G722, G711")
return http.StatusBadRequest, errNoSupportedCodecs
}
tracks, err := pc.SetupOutgoingTracks(videoTrack, audioTrack)