diff --git a/internal/ffmpeg/ffmpeg_test.go b/internal/ffmpeg/ffmpeg_test.go index c778babf..929d1ae8 100644 --- a/internal/ffmpeg/ffmpeg_test.go +++ b/internal/ffmpeg/ffmpeg_test.go @@ -1,23 +1,23 @@ package ffmpeg import ( - "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "testing" ) func TestParseArgs(t *testing.T) { args := parseArgs("rtsp://example.com#video=h264#rotate=180") - assert.Equal(t, "ffmpeg -hide_banner -allowed_media_types video -fflags nobuffer -flags low_delay -timeout 5000000 -user_agent go2rtc/ffmpeg -rtsp_transport tcp -i rtsp://example.com -c:v libx264 -g 50 -profile:v high -level:v 4.1 -preset:v superfast -tune:v zerolatency -pix_fmt:v yuvj420p -an -vf transpose=1,transpose=1 -user_agent ffmpeg/go2rtc -rtsp_transport tcp -f rtsp {output}", args.String()) + require.Equal(t, "ffmpeg -hide_banner -allowed_media_types video -fflags nobuffer -flags low_delay -timeout 5000000 -user_agent go2rtc/ffmpeg -rtsp_flags prefer_tcp -i rtsp://example.com -c:v libx264 -g 50 -profile:v high -level:v 4.1 -preset:v superfast -tune:v zerolatency -pix_fmt:v yuvj420p -an -vf transpose=1,transpose=1 -user_agent ffmpeg/go2rtc -rtsp_transport tcp -f rtsp {output}", args.String()) args = parseArgs("rtsp://example.com#video=h264#rotate=180#hardware=vaapi") - assert.Equal(t, "ffmpeg -hide_banner -hwaccel vaapi -hwaccel_output_format vaapi -allowed_media_types video -fflags nobuffer -flags low_delay -timeout 5000000 -user_agent go2rtc/ffmpeg -rtsp_transport tcp -i rtsp://example.com -c:v h264_vaapi -g 50 -bf 0 -profile:v high -level:v 4.1 -sei:v 0 -an -vf format=vaapi|nv12,hwupload,transpose_vaapi=4 -user_agent ffmpeg/go2rtc -rtsp_transport tcp -f rtsp {output}", args.String()) + require.Equal(t, "ffmpeg -hide_banner -hwaccel vaapi -hwaccel_output_format vaapi -allowed_media_types video -fflags nobuffer -flags low_delay -timeout 5000000 -user_agent go2rtc/ffmpeg -rtsp_flags prefer_tcp -i rtsp://example.com -c:v h264_vaapi -g 50 -bf 0 -profile:v high -level:v 4.1 -sei:v 0 -an -vf format=vaapi|nv12,hwupload,transpose_vaapi=4 -user_agent ffmpeg/go2rtc -rtsp_transport tcp -f rtsp {output}", args.String()) args = parseArgs("/media/bbb.mp4#video=mjpeg") - assert.Equal(t, "ffmpeg -hide_banner -re -i /media/bbb.mp4 -c:v mjpeg -an -f mjpeg -", args.String()) + require.Equal(t, "ffmpeg -hide_banner -re -i /media/bbb.mp4 -c:v mjpeg -an -f mjpeg -", args.String()) args = parseArgs("/media/bbb.mp4#video=mjpeg#hardware=vaapi") - assert.Equal(t, "ffmpeg -hide_banner -hwaccel vaapi -hwaccel_output_format vaapi -re -i /media/bbb.mp4 -c:v mjpeg_vaapi -an -vf format=vaapi|nv12,hwupload -f mjpeg -", args.String()) + require.Equal(t, "ffmpeg -hide_banner -hwaccel vaapi -hwaccel_output_format vaapi -re -i /media/bbb.mp4 -c:v mjpeg_vaapi -an -vf format=vaapi|nv12,hwupload -f mjpeg -", args.String()) args = parseArgs("device?video=0&input_format=mjpeg&video_size=1920x1080") - assert.Equal(t, `ffmpeg -hide_banner -f dshow -input_format mjpeg -video_size 1920x1080 -i video="0" -c copy -f mjpeg -`, args.String()) + require.Equal(t, `ffmpeg -hide_banner -f dshow -input_format mjpeg -video_size 1920x1080 -i video="0" -c copy -f mjpeg -`, args.String()) } diff --git a/internal/hass/hass.go b/internal/hass/hass.go index 67dbbf41..e19389af 100644 --- a/internal/hass/hass.go +++ b/internal/hass/hass.go @@ -201,7 +201,7 @@ func importWebRTC(token string) error { for name, entityID := range webrtcEntities { entities[name] = "hass://supervisor?entity_id=" + entityID - log.Debug().Msgf("[hass] load webrtc name=%s entity_id=%d", name, entityID) + log.Debug().Msgf("[hass] load webrtc name=%s entity_id=%s", name, entityID) } return nil diff --git a/internal/webrtc/client.go b/internal/webrtc/client.go index 8a13a288..a246c5fa 100644 --- a/internal/webrtc/client.go +++ b/internal/webrtc/client.go @@ -107,7 +107,7 @@ func asyncClient(url string) (core.Producer, error) { msg := new(ws.Message) if err = conn.ReadJSON(msg); err != nil { if cerr, ok := err.(*websocket.CloseError); ok { - log.Trace().Err(err).Caller().Msgf("[webrtc] ws code=%d", cerr) + log.Trace().Err(err).Caller().Msgf("[webrtc] ws code=%d", cerr.Code) } break } diff --git a/pkg/rtsp/client_test.go b/pkg/rtsp/client_test.go index 11bb3049..39f3519f 100644 --- a/pkg/rtsp/client_test.go +++ b/pkg/rtsp/client_test.go @@ -88,7 +88,7 @@ Session: 1 require.Nil(t, err) require.Len(t, client.Medias, 3) - ch, err := client.SetupMedia(client.Medias[2], true) + ch, err := client.SetupMedia(client.Medias[2]) require.Nil(t, err) require.Equal(t, ch, byte(4)) }