From 5b29306d4fb8ed977d2d48e9508b9dafc229b836 Mon Sep 17 00:00:00 2001 From: Sergey Krashevich Date: Thu, 4 May 2023 22:18:58 +0300 Subject: [PATCH 1/3] Refactor video toolbox probe commands to use SVGA resolution in hardware_darwin.go --- internal/ffmpeg/hardware/hardware_darwin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/ffmpeg/hardware/hardware_darwin.go b/internal/ffmpeg/hardware/hardware_darwin.go index 923f4159..4f59ca6a 100644 --- a/internal/ffmpeg/hardware/hardware_darwin.go +++ b/internal/ffmpeg/hardware/hardware_darwin.go @@ -4,8 +4,8 @@ import ( "github.com/AlexxIT/go2rtc/internal/api" ) -const ProbeVideoToolboxH264 = "-f lavfi -i testsrc2 -t 1 -c h264_videotoolbox -f null -" -const ProbeVideoToolboxH265 = "-f lavfi -i testsrc2 -t 1 -c hevc_videotoolbox -f null -" +const ProbeVideoToolboxH264 = "-f lavfi -i testsrc2=size=svga -t 1 -c h264_videotoolbox -f null -" +const ProbeVideoToolboxH265 = "-f lavfi -i testsrc2=size=svga -t 1 -c hevc_videotoolbox -f null -" func ProbeAll(bin string) []api.Stream { return []api.Stream{ From fe28c32400c86ef4371a33c590f1bfc66eccc2c3 Mon Sep 17 00:00:00 2001 From: David Buezas Date: Thu, 1 Jun 2023 21:22:37 +0200 Subject: [PATCH 2/3] Add mediaCode 0x12 to CodecH264 identifiers ini DVIRIP stream --- pkg/dvrip/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/dvrip/client.go b/pkg/dvrip/client.go index e8b99583..06686da3 100644 --- a/pkg/dvrip/client.go +++ b/pkg/dvrip/client.go @@ -337,7 +337,7 @@ func (c *Client) ResponseJSON() (res Response, err error) { func (c *Client) AddVideoTrack(mediaCode byte, payload []byte) { var codec *core.Codec switch mediaCode { - case 2: + case 0x02, 0x12: codec = &core.Codec{ Name: core.CodecH264, ClockRate: 90000, From c2f5f37f40d430d92c70de2de17ecfe841413539 Mon Sep 17 00:00:00 2001 From: Marc Kolly Date: Mon, 12 Jun 2023 10:56:53 +0200 Subject: [PATCH 3/3] Fix camera brand typo in README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 96806992..c1444e02 100644 --- a/README.md +++ b/README.md @@ -205,7 +205,7 @@ streams: - rtsp://admin:password@192.168.1.123/cam/realmonitor?channel=1&subtype=1 amcrest_doorbell: - rtsp://username:password@192.168.1.123:554/cam/realmonitor?channel=1&subtype=0#backchannel=0 - unify_camera: rtspx://192.168.1.123:7441/fD6ouM72bWoFijxK + unifi_camera: rtspx://192.168.1.123:7441/fD6ouM72bWoFijxK glichy_camera: ffmpeg:rstp://username:password@192.168.1.123/live/ch00_1 ``` @@ -213,7 +213,7 @@ streams: - **Amcrest Doorbell** users may want to disable two way audio, because with an active stream you won't have a call button working. You need to add `#backchannel=0` to the end of your RTSP link in YAML config file - **Dahua Doorbell** users may want to change backchannel [audio codec](https://github.com/AlexxIT/go2rtc/issues/52) -- **Unify** users may want to disable HTTPS verification. Use `rtspx://` prefix instead of `rtsps://`. And don't use `?enableSrtp` [suffix](https://github.com/AlexxIT/go2rtc/issues/81) +- **Ubiquiti UniFi** users may want to disable HTTPS verification. Use `rtspx://` prefix instead of `rtsps://`. And don't use `?enableSrtp` [suffix](https://github.com/AlexxIT/go2rtc/issues/81) - **TP-Link Tapo** users may skip login and password, because go2rtc support login [without them](https://drmnsamoliu.github.io/video.html) - If your camera has two RTSP links - you can add both of them as sources. This is useful when streams has different codecs, as example AAC audio with main stream and PCMU/PCMA audio with second stream - If the stream from your camera is glitchy, try using [ffmpeg source](#source-ffmpeg). It will not add CPU load if you won't use transcoding