diff --git a/api_proxy_easyjson.go b/api_proxy_easyjson.go index d0dd3f18..1de58c26 100644 --- a/api_proxy_easyjson.go +++ b/api_proxy_easyjson.go @@ -220,7 +220,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling1(in *jlex if out.Error == nil { out.Error = new(Error) } - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling2(in, out.Error) + (*out.Error).UnmarshalEasyJSON(in) } case "hello": if in.IsNull() { @@ -305,7 +305,7 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling1(out *jwr if in.Error != nil { const prefix string = ",\"error\":" out.RawString(prefix) - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling2(out, *in.Error) + (*in.Error).MarshalEasyJSON(out) } if in.Hello != nil { const prefix string = ",\"hello\":" @@ -358,65 +358,7 @@ func (v *ProxyServerMessage) UnmarshalJSON(data []byte) error { func (v *ProxyServerMessage) UnmarshalEasyJSON(l *jlexer.Lexer) { easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling1(l, v) } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling2(in *jlexer.Lexer, out *Error) { - isTopLevel := in.IsStart() - if in.IsNull() { - if isTopLevel { - in.Consumed() - } - in.Skip() - return - } - in.Delim('{') - for !in.IsDelim('}') { - key := in.UnsafeFieldName(false) - in.WantColon() - if in.IsNull() { - in.Skip() - in.WantComma() - continue - } - switch key { - case "code": - out.Code = string(in.String()) - case "message": - out.Message = string(in.String()) - case "details": - if data := in.Raw(); in.Ok() { - in.AddError((out.Details).UnmarshalJSON(data)) - } - default: - in.SkipRecursive() - } - in.WantComma() - } - in.Delim('}') - if isTopLevel { - in.Consumed() - } -} -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling2(out *jwriter.Writer, in Error) { - out.RawByte('{') - first := true - _ = first - { - const prefix string = ",\"code\":" - out.RawString(prefix[1:]) - out.String(string(in.Code)) - } - { - const prefix string = ",\"message\":" - out.RawString(prefix) - out.String(string(in.Message)) - } - if len(in.Details) != 0 { - const prefix string = ",\"details\":" - out.RawString(prefix) - out.Raw((in.Details).MarshalJSON()) - } - out.RawByte('}') -} -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling3(in *jlexer.Lexer, out *ProxyInformationEtcd) { +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling2(in *jlexer.Lexer, out *ProxyInformationEtcd) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -447,7 +389,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling3(in *jlex in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling3(out *jwriter.Writer, in ProxyInformationEtcd) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling2(out *jwriter.Writer, in ProxyInformationEtcd) { out.RawByte('{') first := true _ = first @@ -462,27 +404,27 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling3(out *jwr // MarshalJSON supports json.Marshaler interface func (v ProxyInformationEtcd) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling3(&w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling2(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v ProxyInformationEtcd) MarshalEasyJSON(w *jwriter.Writer) { - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling3(w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling2(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *ProxyInformationEtcd) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling3(&r, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling2(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *ProxyInformationEtcd) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling3(l, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling2(l, v) } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling4(in *jlexer.Lexer, out *ProxyClientMessage) { +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling3(in *jlexer.Lexer, out *ProxyClientMessage) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -555,7 +497,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling4(in *jlex in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling4(out *jwriter.Writer, in ProxyClientMessage) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling3(out *jwriter.Writer, in ProxyClientMessage) { out.RawByte('{') first := true _ = first @@ -601,27 +543,27 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling4(out *jwr // MarshalJSON supports json.Marshaler interface func (v ProxyClientMessage) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling4(&w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling3(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v ProxyClientMessage) MarshalEasyJSON(w *jwriter.Writer) { - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling4(w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling3(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *ProxyClientMessage) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling4(&r, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling3(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *ProxyClientMessage) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling4(l, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling3(l, v) } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling5(in *jlexer.Lexer, out *PayloadProxyServerMessage) { +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling4(in *jlexer.Lexer, out *PayloadProxyServerMessage) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -676,7 +618,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling5(in *jlex in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling5(out *jwriter.Writer, in PayloadProxyServerMessage) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling4(out *jwriter.Writer, in PayloadProxyServerMessage) { out.RawByte('{') first := true _ = first @@ -723,27 +665,27 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling5(out *jwr // MarshalJSON supports json.Marshaler interface func (v PayloadProxyServerMessage) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling5(&w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling4(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v PayloadProxyServerMessage) MarshalEasyJSON(w *jwriter.Writer) { - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling5(w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling4(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *PayloadProxyServerMessage) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling5(&r, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling4(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *PayloadProxyServerMessage) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling5(l, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling4(l, v) } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling6(in *jlexer.Lexer, out *PayloadProxyClientMessage) { +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling5(in *jlexer.Lexer, out *PayloadProxyClientMessage) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -804,7 +746,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling6(in *jlex in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling6(out *jwriter.Writer, in PayloadProxyClientMessage) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling5(out *jwriter.Writer, in PayloadProxyClientMessage) { out.RawByte('{') first := true _ = first @@ -854,27 +796,27 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling6(out *jwr // MarshalJSON supports json.Marshaler interface func (v PayloadProxyClientMessage) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling6(&w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling5(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v PayloadProxyClientMessage) MarshalEasyJSON(w *jwriter.Writer) { - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling6(w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling5(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *PayloadProxyClientMessage) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling6(&r, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling5(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *PayloadProxyClientMessage) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling6(l, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling5(l, v) } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling7(in *jlexer.Lexer, out *HelloProxyServerMessage) { +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling6(in *jlexer.Lexer, out *NewPublisherSettings) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -893,20 +835,18 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling7(in *jlex continue } switch key { - case "version": - out.Version = string(in.String()) - case "sessionid": - out.SessionId = string(in.String()) - case "server": - if in.IsNull() { - in.Skip() - out.Server = nil - } else { - if out.Server == nil { - out.Server = new(WelcomeServerMessage) - } - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling8(in, out.Server) - } + case "bitrate": + out.Bitrate = int(in.Int()) + case "mediatypes": + out.MediaTypes = MediaType(in.Int()) + case "audiocodec": + out.AudioCodec = string(in.String()) + case "videocodec": + out.VideoCodec = string(in.String()) + case "vp9_profile": + out.VP9Profile = string(in.String()) + case "h264_profile": + out.H264Profile = string(in.String()) default: in.SkipRecursive() } @@ -917,52 +857,93 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling7(in *jlex in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling7(out *jwriter.Writer, in HelloProxyServerMessage) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling6(out *jwriter.Writer, in NewPublisherSettings) { out.RawByte('{') first := true _ = first - { - const prefix string = ",\"version\":" + if in.Bitrate != 0 { + const prefix string = ",\"bitrate\":" + first = false out.RawString(prefix[1:]) - out.String(string(in.Version)) + out.Int(int(in.Bitrate)) } - { - const prefix string = ",\"sessionid\":" - out.RawString(prefix) - out.String(string(in.SessionId)) + if in.MediaTypes != 0 { + const prefix string = ",\"mediatypes\":" + if first { + first = false + out.RawString(prefix[1:]) + } else { + out.RawString(prefix) + } + out.Int(int(in.MediaTypes)) } - if in.Server != nil { - const prefix string = ",\"server\":" - out.RawString(prefix) - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling8(out, *in.Server) + if in.AudioCodec != "" { + const prefix string = ",\"audiocodec\":" + if first { + first = false + out.RawString(prefix[1:]) + } else { + out.RawString(prefix) + } + out.String(string(in.AudioCodec)) + } + if in.VideoCodec != "" { + const prefix string = ",\"videocodec\":" + if first { + first = false + out.RawString(prefix[1:]) + } else { + out.RawString(prefix) + } + out.String(string(in.VideoCodec)) + } + if in.VP9Profile != "" { + const prefix string = ",\"vp9_profile\":" + if first { + first = false + out.RawString(prefix[1:]) + } else { + out.RawString(prefix) + } + out.String(string(in.VP9Profile)) + } + if in.H264Profile != "" { + const prefix string = ",\"h264_profile\":" + if first { + first = false + out.RawString(prefix[1:]) + } else { + out.RawString(prefix) + } + out.String(string(in.H264Profile)) } out.RawByte('}') } // MarshalJSON supports json.Marshaler interface -func (v HelloProxyServerMessage) MarshalJSON() ([]byte, error) { +func (v NewPublisherSettings) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling7(&w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling6(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface -func (v HelloProxyServerMessage) MarshalEasyJSON(w *jwriter.Writer) { - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling7(w, v) +func (v NewPublisherSettings) MarshalEasyJSON(w *jwriter.Writer) { + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling6(w, v) } // UnmarshalJSON supports json.Unmarshaler interface -func (v *HelloProxyServerMessage) UnmarshalJSON(data []byte) error { +func (v *NewPublisherSettings) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling7(&r, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling6(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface -func (v *HelloProxyServerMessage) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling7(l, v) +func (v *NewPublisherSettings) UnmarshalEasyJSON(l *jlexer.Lexer) { + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling6(l, v) } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling8(in *jlexer.Lexer, out *WelcomeServerMessage) { +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling7(in *jlexer.Lexer, out *HelloProxyServerMessage) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -983,31 +964,18 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling8(in *jlex switch key { case "version": out.Version = string(in.String()) - case "features": + case "sessionid": + out.SessionId = string(in.String()) + case "server": if in.IsNull() { in.Skip() - out.Features = nil + out.Server = nil } else { - in.Delim('[') - if out.Features == nil { - if !in.IsDelim(']') { - out.Features = make([]string, 0, 4) - } else { - out.Features = []string{} - } - } else { - out.Features = (out.Features)[:0] - } - for !in.IsDelim(']') { - var v5 string - v5 = string(in.String()) - out.Features = append(out.Features, v5) - in.WantComma() + if out.Server == nil { + out.Server = new(WelcomeServerMessage) } - in.Delim(']') + (*out.Server).UnmarshalEasyJSON(in) } - case "country": - out.Country = string(in.String()) default: in.SkipRecursive() } @@ -1018,7 +986,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling8(in *jlex in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling8(out *jwriter.Writer, in WelcomeServerMessage) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling7(out *jwriter.Writer, in HelloProxyServerMessage) { out.RawByte('{') first := true _ = first @@ -1027,28 +995,43 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling8(out *jwr out.RawString(prefix[1:]) out.String(string(in.Version)) } - if len(in.Features) != 0 { - const prefix string = ",\"features\":" + { + const prefix string = ",\"sessionid\":" out.RawString(prefix) - { - out.RawByte('[') - for v6, v7 := range in.Features { - if v6 > 0 { - out.RawByte(',') - } - out.String(string(v7)) - } - out.RawByte(']') - } + out.String(string(in.SessionId)) } - if in.Country != "" { - const prefix string = ",\"country\":" + if in.Server != nil { + const prefix string = ",\"server\":" out.RawString(prefix) - out.String(string(in.Country)) + (*in.Server).MarshalEasyJSON(out) } out.RawByte('}') } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling9(in *jlexer.Lexer, out *HelloProxyClientMessage) { + +// MarshalJSON supports json.Marshaler interface +func (v HelloProxyServerMessage) MarshalJSON() ([]byte, error) { + w := jwriter.Writer{} + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling7(&w, v) + return w.Buffer.BuildBytes(), w.Error +} + +// MarshalEasyJSON supports easyjson.Marshaler interface +func (v HelloProxyServerMessage) MarshalEasyJSON(w *jwriter.Writer) { + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling7(w, v) +} + +// UnmarshalJSON supports json.Unmarshaler interface +func (v *HelloProxyServerMessage) UnmarshalJSON(data []byte) error { + r := jlexer.Lexer{Data: data} + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling7(&r, v) + return r.Error() +} + +// UnmarshalEasyJSON supports easyjson.Unmarshaler interface +func (v *HelloProxyServerMessage) UnmarshalEasyJSON(l *jlexer.Lexer) { + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling7(l, v) +} +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling8(in *jlexer.Lexer, out *HelloProxyClientMessage) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1087,9 +1070,9 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling9(in *jlex out.Features = (out.Features)[:0] } for !in.IsDelim(']') { - var v8 string - v8 = string(in.String()) - out.Features = append(out.Features, v8) + var v5 string + v5 = string(in.String()) + out.Features = append(out.Features, v5) in.WantComma() } in.Delim(']') @@ -1106,7 +1089,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling9(in *jlex in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling9(out *jwriter.Writer, in HelloProxyClientMessage) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling8(out *jwriter.Writer, in HelloProxyClientMessage) { out.RawByte('{') first := true _ = first @@ -1125,11 +1108,11 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling9(out *jwr out.RawString(prefix) { out.RawByte('[') - for v9, v10 := range in.Features { - if v9 > 0 { + for v6, v7 := range in.Features { + if v6 > 0 { out.RawByte(',') } - out.String(string(v10)) + out.String(string(v7)) } out.RawByte(']') } @@ -1145,27 +1128,27 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling9(out *jwr // MarshalJSON supports json.Marshaler interface func (v HelloProxyClientMessage) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling9(&w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling8(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v HelloProxyClientMessage) MarshalEasyJSON(w *jwriter.Writer) { - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling9(w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling8(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *HelloProxyClientMessage) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling9(&r, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling8(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *HelloProxyClientMessage) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling9(l, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling8(l, v) } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling10(in *jlexer.Lexer, out *EventProxyServerMessage) { +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling9(in *jlexer.Lexer, out *EventProxyServerMessage) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1212,7 +1195,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling10(in *jle in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling10(out *jwriter.Writer, in EventProxyServerMessage) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling9(out *jwriter.Writer, in EventProxyServerMessage) { out.RawByte('{') first := true _ = first @@ -1247,27 +1230,27 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling10(out *jw // MarshalJSON supports json.Marshaler interface func (v EventProxyServerMessage) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling10(&w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling9(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v EventProxyServerMessage) MarshalEasyJSON(w *jwriter.Writer) { - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling10(w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling9(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *EventProxyServerMessage) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling10(&r, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling9(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *EventProxyServerMessage) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling10(l, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling9(l, v) } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling11(in *jlexer.Lexer, out *EventProxyServerBandwidth) { +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling10(in *jlexer.Lexer, out *EventProxyServerBandwidth) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1316,7 +1299,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling11(in *jle in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling11(out *jwriter.Writer, in EventProxyServerBandwidth) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling10(out *jwriter.Writer, in EventProxyServerBandwidth) { out.RawByte('{') first := true _ = first @@ -1342,27 +1325,27 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling11(out *jw // MarshalJSON supports json.Marshaler interface func (v EventProxyServerBandwidth) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling11(&w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling10(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v EventProxyServerBandwidth) MarshalEasyJSON(w *jwriter.Writer) { - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling11(w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling10(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *EventProxyServerBandwidth) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling11(&r, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling10(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *EventProxyServerBandwidth) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling11(l, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling10(l, v) } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling12(in *jlexer.Lexer, out *CommandProxyServerMessage) { +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling11(in *jlexer.Lexer, out *CommandProxyServerMessage) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1403,9 +1386,9 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling12(in *jle out.Streams = (out.Streams)[:0] } for !in.IsDelim(']') { - var v11 PublisherStream - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling13(in, &v11) - out.Streams = append(out.Streams, v11) + var v8 PublisherStream + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling12(in, &v8) + out.Streams = append(out.Streams, v8) in.WantComma() } in.Delim(']') @@ -1420,7 +1403,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling12(in *jle in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling12(out *jwriter.Writer, in CommandProxyServerMessage) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling11(out *jwriter.Writer, in CommandProxyServerMessage) { out.RawByte('{') first := true _ = first @@ -1460,11 +1443,11 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling12(out *jw } { out.RawByte('[') - for v12, v13 := range in.Streams { - if v12 > 0 { + for v9, v10 := range in.Streams { + if v9 > 0 { out.RawByte(',') } - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling13(out, v13) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling12(out, v10) } out.RawByte(']') } @@ -1475,27 +1458,27 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling12(out *jw // MarshalJSON supports json.Marshaler interface func (v CommandProxyServerMessage) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling12(&w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling11(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v CommandProxyServerMessage) MarshalEasyJSON(w *jwriter.Writer) { - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling12(w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling11(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *CommandProxyServerMessage) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling12(&r, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling11(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *CommandProxyServerMessage) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling12(l, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling11(l, v) } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling13(in *jlexer.Lexer, out *PublisherStream) { +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling12(in *jlexer.Lexer, out *PublisherStream) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1554,7 +1537,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling13(in *jle in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling13(out *jwriter.Writer, in PublisherStream) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling12(out *jwriter.Writer, in PublisherStream) { out.RawByte('{') first := true _ = first @@ -1635,7 +1618,7 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling13(out *jw } out.RawByte('}') } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling14(in *jlexer.Lexer, out *CommandProxyClientMessage) { +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling13(in *jlexer.Lexer, out *CommandProxyClientMessage) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1668,6 +1651,16 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling14(in *jle out.Bitrate = int(in.Int()) case "mediatypes": out.MediaTypes = MediaType(in.Int()) + case "publisherSettings": + if in.IsNull() { + in.Skip() + out.PublisherSettings = nil + } else { + if out.PublisherSettings == nil { + out.PublisherSettings = new(NewPublisherSettings) + } + (*out.PublisherSettings).UnmarshalEasyJSON(in) + } case "remoteUrl": out.RemoteUrl = string(in.String()) case "remoteToken": @@ -1688,7 +1681,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling14(in *jle in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling14(out *jwriter.Writer, in CommandProxyClientMessage) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling13(out *jwriter.Writer, in CommandProxyClientMessage) { out.RawByte('{') first := true _ = first @@ -1727,6 +1720,11 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling14(out *jw out.RawString(prefix) out.Int(int(in.MediaTypes)) } + if in.PublisherSettings != nil { + const prefix string = ",\"publisherSettings\":" + out.RawString(prefix) + (*in.PublisherSettings).MarshalEasyJSON(out) + } if in.RemoteUrl != "" { const prefix string = ",\"remoteUrl\":" out.RawString(prefix) @@ -1758,27 +1756,27 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling14(out *jw // MarshalJSON supports json.Marshaler interface func (v CommandProxyClientMessage) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling14(&w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling13(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v CommandProxyClientMessage) MarshalEasyJSON(w *jwriter.Writer) { - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling14(w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling13(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *CommandProxyClientMessage) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling14(&r, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling13(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *CommandProxyClientMessage) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling14(l, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling13(l, v) } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling15(in *jlexer.Lexer, out *ByeProxyServerMessage) { +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling14(in *jlexer.Lexer, out *ByeProxyServerMessage) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1809,7 +1807,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling15(in *jle in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling15(out *jwriter.Writer, in ByeProxyServerMessage) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling14(out *jwriter.Writer, in ByeProxyServerMessage) { out.RawByte('{') first := true _ = first @@ -1824,27 +1822,27 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling15(out *jw // MarshalJSON supports json.Marshaler interface func (v ByeProxyServerMessage) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling15(&w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling14(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v ByeProxyServerMessage) MarshalEasyJSON(w *jwriter.Writer) { - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling15(w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling14(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *ByeProxyServerMessage) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling15(&r, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling14(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *ByeProxyServerMessage) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling15(l, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling14(l, v) } -func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling16(in *jlexer.Lexer, out *ByeProxyClientMessage) { +func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling15(in *jlexer.Lexer, out *ByeProxyClientMessage) { isTopLevel := in.IsStart() if in.IsNull() { if isTopLevel { @@ -1873,7 +1871,7 @@ func easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling16(in *jle in.Consumed() } } -func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling16(out *jwriter.Writer, in ByeProxyClientMessage) { +func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling15(out *jwriter.Writer, in ByeProxyClientMessage) { out.RawByte('{') first := true _ = first @@ -1883,23 +1881,23 @@ func easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling16(out *jw // MarshalJSON supports json.Marshaler interface func (v ByeProxyClientMessage) MarshalJSON() ([]byte, error) { w := jwriter.Writer{} - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling16(&w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling15(&w, v) return w.Buffer.BuildBytes(), w.Error } // MarshalEasyJSON supports easyjson.Marshaler interface func (v ByeProxyClientMessage) MarshalEasyJSON(w *jwriter.Writer) { - easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling16(w, v) + easyjson1c8542dbEncodeGithubComStrukturagNextcloudSpreedSignaling15(w, v) } // UnmarshalJSON supports json.Unmarshaler interface func (v *ByeProxyClientMessage) UnmarshalJSON(data []byte) error { r := jlexer.Lexer{Data: data} - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling16(&r, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling15(&r, v) return r.Error() } // UnmarshalEasyJSON supports easyjson.Unmarshaler interface func (v *ByeProxyClientMessage) UnmarshalEasyJSON(l *jlexer.Lexer) { - easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling16(l, v) + easyjson1c8542dbDecodeGithubComStrukturagNextcloudSpreedSignaling15(l, v) } diff --git a/api_signaling_easyjson.go b/api_signaling_easyjson.go index 773039fc..9d2423b0 100644 --- a/api_signaling_easyjson.go +++ b/api_signaling_easyjson.go @@ -2464,8 +2464,6 @@ func easyjson29f189fbDecodeGithubComStrukturagNextcloudSpreedSignaling21(in *jle out.Sid = string(in.String()) case "roomType": out.RoomType = string(in.String()) - case "bitrate": - out.Bitrate = int(in.Int()) case "payload": if in.IsNull() { in.Skip() @@ -2488,6 +2486,16 @@ func easyjson29f189fbDecodeGithubComStrukturagNextcloudSpreedSignaling21(in *jle } in.Delim('}') } + case "bitrate": + out.Bitrate = int(in.Int()) + case "audiocodec": + out.AudioCodec = string(in.String()) + case "videocodec": + out.VideoCodec = string(in.String()) + case "vp9profile": + out.VP9Profile = string(in.String()) + case "h264profile": + out.H264Profile = string(in.String()) default: in.SkipRecursive() } @@ -2517,11 +2525,6 @@ func easyjson29f189fbEncodeGithubComStrukturagNextcloudSpreedSignaling21(out *jw out.RawString(prefix) out.String(string(in.RoomType)) } - if in.Bitrate != 0 { - const prefix string = ",\"bitrate\":" - out.RawString(prefix) - out.Int(int(in.Bitrate)) - } { const prefix string = ",\"payload\":" out.RawString(prefix) @@ -2549,6 +2552,31 @@ func easyjson29f189fbEncodeGithubComStrukturagNextcloudSpreedSignaling21(out *jw out.RawByte('}') } } + if in.Bitrate != 0 { + const prefix string = ",\"bitrate\":" + out.RawString(prefix) + out.Int(int(in.Bitrate)) + } + if in.AudioCodec != "" { + const prefix string = ",\"audiocodec\":" + out.RawString(prefix) + out.String(string(in.AudioCodec)) + } + if in.VideoCodec != "" { + const prefix string = ",\"videocodec\":" + out.RawString(prefix) + out.String(string(in.VideoCodec)) + } + if in.VP9Profile != "" { + const prefix string = ",\"vp9profile\":" + out.RawString(prefix) + out.String(string(in.VP9Profile)) + } + if in.H264Profile != "" { + const prefix string = ",\"h264profile\":" + out.RawString(prefix) + out.String(string(in.H264Profile)) + } out.RawByte('}') }