Skip to content

Commit

Permalink
Add support for enable_transcoding (#60)
Browse files Browse the repository at this point in the history
  • Loading branch information
biglittlebigben authored Apr 26, 2024
1 parent c8d011f commit 329ad1a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion protocol
Submodule protocol updated 79 files
+6 −0 .changeset/new-owls-notice.md
+6 −0 .changeset/tidy-pigs-burn.md
+8 −0 .changeset/two-dogs-change.md
+1 −1 .github/workflows/buildtest.yaml
+2 −0 .idea/.gitignore
+10 −0 CHANGELOG.md
+31 −0 agent/token.go
+46 −35 egress/types.go
+6 −4 go.mod
+10 −4 go.sum
+34 −0 ingress/validation.go
+44 −0 ingress/validation_test.go
+886 −247 livekit/livekit_agent.pb.go
+314 −266 livekit/livekit_analytics.pb.go
+301 −242 livekit/livekit_ingress.pb.go
+92 −89 livekit/livekit_ingress.twirp.go
+633 −372 livekit/livekit_models.pb.go
+26 −3 livekit/livekit_sip.pb.go
+59 −57 livekit/livekit_sip.twirp.go
+9 −2 livekit/types.go
+28 −0 logger/logger.go
+17 −0 logger/logger_test.go
+9 −19 logger/pionlogger/logadapter.go
+41 −9 logger/pionlogger/logger.go
+139 −0 logger/pionlogger/zaplogadapter.go
+102 −0 logger/slog.go
+23 −0 logger/zaputil/orlevelenabler.go
+1 −1 package.json
+6 −0 packages/javascript/CHANGELOG.md
+1 −1 packages/javascript/package.json
+12 −12 pnpm-lock.yaml
+73 −10 protobufs/livekit_agent.proto
+9 −3 protobufs/livekit_analytics.proto
+15 −8 protobufs/livekit_ingress.proto
+24 −1 protobufs/livekit_models.proto
+6 −0 protobufs/livekit_sip.proto
+12 −5 protobufs/rpc/agent.proto
+1 −5 protobufs/rpc/egress.proto
+2 −2 protobufs/rpc/ingress.proto
+3 −3 protobufs/rpc/io.proto
+1 −1 protobufs/rpc/keepalive.proto
+1 −1 protobufs/rpc/participant.proto
+1 −1 protobufs/rpc/room.proto
+1 −1 protobufs/rpc/signal.proto
+4 −1 protobufs/rpc/sip.proto
+42 −31 rpc/agent.pb.go
+41 −39 rpc/agent.psrpc.go
+91 −117 rpc/egress.pb.go
+32 −38 rpc/egress.psrpc.go
+1 −1 rpc/egress_client.go
+4 −4 rpc/ingress.pb.go
+34 −34 rpc/ingress.psrpc.go
+1 −1 rpc/ingress_client.go
+3 −4 rpc/io.pb.go
+64 −64 rpc/io.psrpc.go
+4 −5 rpc/keepalive.pb.go
+5 −5 rpc/keepalive.psrpc.go
+100 −30 rpc/metrics.go
+3 −4 rpc/participant.pb.go
+19 −19 rpc/participant.psrpc.go
+3 −4 rpc/room.pb.go
+5 −5 rpc/room.psrpc.go
+3 −4 rpc/signal.pb.go
+21 −21 rpc/signal.psrpc.go
+33 −22 rpc/sip.pb.go
+26 −25 rpc/sip.psrpc.go
+14 −14 rpc/typed_api.go
+30 −0 utils/clock.go
+71 −0 utils/hedge.go
+41 −0 utils/hedge_test.go
+97 −14 utils/id.go
+10 −0 utils/id_test.go
+52 −0 utils/promise.go
+114 −0 utils/rate.go
+531 −0 utils/rate_test.go
+36 −58 utils/timed_version.go
+12 −12 utils/timed_version_test.go
+52 −59 utils/timeseries/timeseries.go
+12 −1 utils/timeseries/timeseries_test.go
10 changes: 10 additions & 0 deletions src/main/kotlin/io/livekit/server/IngressServiceClient.kt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class IngressServiceClient(
audioOptions: LivekitIngress.IngressAudioOptions? = null,
videoOptions: LivekitIngress.IngressVideoOptions? = null,
bypassTranscoding: Boolean? = null,
enableTranscoding: Boolean? = null,
url: String? = null,
): Call<LivekitIngress.IngressInfo> {
val request = with(LivekitIngress.CreateIngressRequest.newBuilder()) {
Expand All @@ -64,6 +65,10 @@ class IngressServiceClient(
this.bypassTranscoding = bypassTranscoding
}

if (enableTranscoding != null) {
this.enableTranscoding = enableTranscoding
}

if (url != null) {
this.url = url
}
Expand Down Expand Up @@ -94,6 +99,7 @@ class IngressServiceClient(
audioOptions: LivekitIngress.IngressAudioOptions? = null,
videoOptions: LivekitIngress.IngressVideoOptions? = null,
bypassTranscoding: Boolean? = null,
enableTranscoding: Boolean? = null,
): Call<LivekitIngress.IngressInfo> {
val request = with(LivekitIngress.UpdateIngressRequest.newBuilder()) {
this.ingressId = ingressID
Expand All @@ -114,6 +120,10 @@ class IngressServiceClient(
this.bypassTranscoding = bypassTranscoding
}

if (enableTranscoding != null) {
this.enableTranscoding = enableTranscoding
}

if (participantName != null) {
this.participantName = participantName
}
Expand Down

0 comments on commit 329ad1a

Please sign in to comment.