From d598e06d9f171747acd96641b87e91919231bf05 Mon Sep 17 00:00:00 2001 From: Benjamin Pracht Date: Tue, 30 May 2023 13:41:12 -0700 Subject: [PATCH] Add support for bypass_transcoding field in ingress (#1741) --- go.mod | 4 ++-- go.sum | 8 ++++---- pkg/service/ingress.go | 4 ++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 52792aa9f..1e64e453c 100644 --- a/go.mod +++ b/go.mod @@ -18,8 +18,8 @@ require ( github.com/jxskiss/base62 v1.1.0 github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 github.com/livekit/mediatransportutil v0.0.0-20230523035537-27577c4e1646 - github.com/livekit/protocol v1.5.7 - github.com/livekit/psrpc v0.3.1-0.20230528083849-53d664c6d912 + github.com/livekit/protocol v1.5.8-0.20230525225706-52cca4239cf2 + github.com/livekit/psrpc v0.3.1-0.20230518234341-6f6847e10b09 github.com/mackerelio/go-osstat v0.2.4 github.com/magefile/mage v1.15.0 github.com/maxbrunsfeld/counterfeiter/v6 v6.6.1 diff --git a/go.sum b/go.sum index ef1c229cb..5e6a6c282 100644 --- a/go.sum +++ b/go.sum @@ -122,10 +122,10 @@ github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1 h1:jm09419p0lqTkD github.com/livekit/mageutil v0.0.0-20230125210925-54e8a70427c1/go.mod h1:Rs3MhFwutWhGwmY1VQsygw28z5bWcnEYmS1OG9OxjOQ= github.com/livekit/mediatransportutil v0.0.0-20230523035537-27577c4e1646 h1:acGSGkWJdut7TUWozCDheHu4dwWFDqqRzv+SBbIY9Xo= github.com/livekit/mediatransportutil v0.0.0-20230523035537-27577c4e1646/go.mod h1:MRc0zSOSzXuFt0X218SgabzlaKevkvCckPgBEoHYc34= -github.com/livekit/protocol v1.5.7 h1:jZeFQEmLuIhFblXDGPRCBbfjVJHb+YU7AsO+SMoXF70= -github.com/livekit/protocol v1.5.7/go.mod h1:ZaOnsvP+JS4s7vI1UO+JVdBagvvLp/lBXDAl2hkDS0I= -github.com/livekit/psrpc v0.3.1-0.20230528083849-53d664c6d912 h1:q6i7ptxK6yZ220eyCWx5l1ZsUMQNyuYZ5feG91sM8EI= -github.com/livekit/psrpc v0.3.1-0.20230528083849-53d664c6d912/go.mod h1:n6JntEg+zT6Ji8InoyTpV7wusPNwGqqtxmHlkNhDN0U= +github.com/livekit/protocol v1.5.8-0.20230525225706-52cca4239cf2 h1:cE/OQiQyre2NFQlHwwZXGV97mTTFOHess37qkWt6Ctg= +github.com/livekit/protocol v1.5.8-0.20230525225706-52cca4239cf2/go.mod h1:ZaOnsvP+JS4s7vI1UO+JVdBagvvLp/lBXDAl2hkDS0I= +github.com/livekit/psrpc v0.3.1-0.20230518234341-6f6847e10b09 h1:mb6jRcg57U0HQ4tKRsueHHKcvTqBinL6+0Aa84vTtWk= +github.com/livekit/psrpc v0.3.1-0.20230518234341-6f6847e10b09/go.mod h1:n6JntEg+zT6Ji8InoyTpV7wusPNwGqqtxmHlkNhDN0U= github.com/mackerelio/go-osstat v0.2.4 h1:qxGbdPkFo65PXOb/F/nhDKpF2nGmGaCFDLXoZjJTtUs= github.com/mackerelio/go-osstat v0.2.4/go.mod h1:Zy+qzGdZs3A9cuIqmgbJvwbmLQH9dJvtio5ZjJTbdlQ= github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg= diff --git a/pkg/service/ingress.go b/pkg/service/ingress.go index 9456224a0..cb5604e2c 100644 --- a/pkg/service/ingress.go +++ b/pkg/service/ingress.go @@ -94,6 +94,7 @@ func (s *IngressService) CreateIngressWithUrlPrefix(ctx context.Context, urlPref InputType: req.InputType, Audio: req.Audio, Video: req.Video, + BypassTranscoding: req.BypassTranscoding, RoomName: req.RoomName, ParticipantIdentity: req.ParticipantIdentity, ParticipantName: req.ParticipantName, @@ -126,6 +127,9 @@ func updateInfoUsingRequest(req *livekit.UpdateIngressRequest, info *livekit.Ing if req.ParticipantName != "" { info.ParticipantName = req.ParticipantName } + if req.BypassTranscoding != nil { + info.BypassTranscoding = *req.BypassTranscoding + } if req.Audio != nil { info.Audio = req.Audio }