diff --git a/protobuf/video/sfu/models/models.pb.go b/protobuf/video/sfu/models/models.pb.go index b95fda49..848728a8 100644 --- a/protobuf/video/sfu/models/models.pb.go +++ b/protobuf/video/sfu/models/models.pb.go @@ -1563,7 +1563,7 @@ type PublishOption struct { // For SVC codecs, prefer using the L1T3 (single spatial, 3 temporal layers) mode instead. UseSingleLayer bool `protobuf:"varint,9,opt,name=use_single_layer,json=useSingleLayer,proto3" json:"use_single_layer,omitempty"` // Audio bitrate profiles for different audio quality profiles. - AudioBitrateProfiles []*AudioBitrateProfiles `protobuf:"bytes,10,rep,name=audio_bitrate_profiles,json=audioBitrateProfiles,proto3" json:"audio_bitrate_profiles,omitempty"` + AudioBitrateProfiles []*AudioBitrate `protobuf:"bytes,10,rep,name=audio_bitrate_profiles,json=audioBitrateProfiles,proto3" json:"audio_bitrate_profiles,omitempty"` } func (x *PublishOption) Reset() { @@ -1661,7 +1661,7 @@ func (x *PublishOption) GetUseSingleLayer() bool { return false } -func (x *PublishOption) GetAudioBitrateProfiles() []*AudioBitrateProfiles { +func (x *PublishOption) GetAudioBitrateProfiles() []*AudioBitrate { if x != nil { return x.AudioBitrateProfiles } @@ -1810,7 +1810,7 @@ func (x *ICETrickle) GetSessionId() string { return "" } -type AudioBitrateProfiles struct { +type AudioBitrate struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -1819,8 +1819,8 @@ type AudioBitrateProfiles struct { Bitrate int32 `protobuf:"varint,2,opt,name=bitrate,proto3" json:"bitrate,omitempty"` } -func (x *AudioBitrateProfiles) Reset() { - *x = AudioBitrateProfiles{} +func (x *AudioBitrate) Reset() { + *x = AudioBitrate{} if protoimpl.UnsafeEnabled { mi := &file_video_sfu_models_models_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1828,13 +1828,13 @@ func (x *AudioBitrateProfiles) Reset() { } } -func (x *AudioBitrateProfiles) String() string { +func (x *AudioBitrate) String() string { return protoimpl.X.MessageStringOf(x) } -func (*AudioBitrateProfiles) ProtoMessage() {} +func (*AudioBitrate) ProtoMessage() {} -func (x *AudioBitrateProfiles) ProtoReflect() protoreflect.Message { +func (x *AudioBitrate) ProtoReflect() protoreflect.Message { mi := &file_video_sfu_models_models_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -1846,19 +1846,19 @@ func (x *AudioBitrateProfiles) ProtoReflect() protoreflect.Message { return mi.MessageOf(x) } -// Deprecated: Use AudioBitrateProfiles.ProtoReflect.Descriptor instead. -func (*AudioBitrateProfiles) Descriptor() ([]byte, []int) { +// Deprecated: Use AudioBitrate.ProtoReflect.Descriptor instead. +func (*AudioBitrate) Descriptor() ([]byte, []int) { return file_video_sfu_models_models_proto_rawDescGZIP(), []int{11} } -func (x *AudioBitrateProfiles) GetProfile() AudioBitrateProfile { +func (x *AudioBitrate) GetProfile() AudioBitrateProfile { if x != nil { return x.Profile } return AudioBitrateProfile_AUDIO_BITRATE_PROFILE_VOICE_STANDARD_UNSPECIFIED } -func (x *AudioBitrateProfiles) GetBitrate() int32 { +func (x *AudioBitrate) GetBitrate() int32 { if x != nil { return x.Bitrate } @@ -3004,7 +3004,7 @@ var file_video_sfu_models_models_proto_rawDesc = []byte{ 0x64, 0x65, 0x63, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x76, 0x69, 0x64, 0x65, 0x6f, 0x2e, 0x73, 0x66, 0x75, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x43, 0x6f, 0x64, 0x65, 0x63, 0x52, 0x06, 0x63, 0x6f, 0x64, 0x65, - 0x63, 0x73, 0x22, 0x83, 0x04, 0x0a, 0x0d, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x4f, 0x70, + 0x63, 0x73, 0x22, 0xfb, 0x03, 0x0a, 0x0d, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a, 0x0a, 0x74, 0x72, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x22, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x76, 0x69, 0x64, 0x65, 0x6f, 0x2e, 0x73, 0x66, 0x75, 0x2e, 0x6d, 0x6f, 0x64, 0x65, @@ -3030,34 +3030,33 @@ var file_video_sfu_models_models_proto_rawDesc = []byte{ 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x75, 0x73, 0x65, 0x5f, 0x73, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x5f, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x75, 0x73, 0x65, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4c, 0x61, - 0x79, 0x65, 0x72, 0x12, 0x63, 0x0a, 0x16, 0x61, 0x75, 0x64, 0x69, 0x6f, 0x5f, 0x62, 0x69, 0x74, + 0x79, 0x65, 0x72, 0x12, 0x5b, 0x0a, 0x16, 0x61, 0x75, 0x64, 0x69, 0x6f, 0x5f, 0x62, 0x69, 0x74, 0x72, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x18, 0x0a, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x76, 0x69, 0x64, + 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x76, 0x69, 0x64, 0x65, 0x6f, 0x2e, 0x73, 0x66, 0x75, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x41, 0x75, - 0x64, 0x69, 0x6f, 0x42, 0x69, 0x74, 0x72, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, - 0x65, 0x73, 0x52, 0x14, 0x61, 0x75, 0x64, 0x69, 0x6f, 0x42, 0x69, 0x74, 0x72, 0x61, 0x74, 0x65, - 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x22, 0xa2, 0x01, 0x0a, 0x05, 0x43, 0x6f, 0x64, - 0x65, 0x63, 0x12, 0x21, 0x0a, 0x0c, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x74, 0x79, - 0x70, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, - 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x6c, 0x6f, - 0x63, 0x6b, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x63, - 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x61, 0x74, 0x65, 0x12, 0x2f, 0x0a, 0x13, 0x65, 0x6e, 0x63, 0x6f, - 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x18, - 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x50, - 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6d, 0x74, - 0x70, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x66, 0x6d, 0x74, 0x70, 0x22, 0x90, 0x01, - 0x0a, 0x0a, 0x49, 0x43, 0x45, 0x54, 0x72, 0x69, 0x63, 0x6b, 0x6c, 0x65, 0x12, 0x3e, 0x0a, 0x09, - 0x70, 0x65, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x21, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x76, 0x69, 0x64, 0x65, 0x6f, 0x2e, 0x73, - 0x66, 0x75, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x54, 0x79, - 0x70, 0x65, 0x52, 0x08, 0x70, 0x65, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x0d, - 0x69, 0x63, 0x65, 0x5f, 0x63, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x63, 0x65, 0x43, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x61, 0x74, - 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, - 0x22, 0x78, 0x0a, 0x14, 0x41, 0x75, 0x64, 0x69, 0x6f, 0x42, 0x69, 0x74, 0x72, 0x61, 0x74, 0x65, - 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x73, 0x12, 0x46, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x66, + 0x64, 0x69, 0x6f, 0x42, 0x69, 0x74, 0x72, 0x61, 0x74, 0x65, 0x52, 0x14, 0x61, 0x75, 0x64, 0x69, + 0x6f, 0x42, 0x69, 0x74, 0x72, 0x61, 0x74, 0x65, 0x50, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x73, + 0x22, 0xa2, 0x01, 0x0a, 0x05, 0x43, 0x6f, 0x64, 0x65, 0x63, 0x12, 0x21, 0x0a, 0x0c, 0x70, 0x61, + 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x0b, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x54, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x72, 0x61, 0x74, 0x65, 0x18, + 0x0e, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x63, 0x6c, 0x6f, 0x63, 0x6b, 0x52, 0x61, 0x74, 0x65, + 0x12, 0x2f, 0x0a, 0x13, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x12, 0x65, + 0x6e, 0x63, 0x6f, 0x64, 0x69, 0x6e, 0x67, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, + 0x73, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6d, 0x74, 0x70, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x66, 0x6d, 0x74, 0x70, 0x22, 0x90, 0x01, 0x0a, 0x0a, 0x49, 0x43, 0x45, 0x54, 0x72, 0x69, + 0x63, 0x6b, 0x6c, 0x65, 0x12, 0x3e, 0x0a, 0x09, 0x70, 0x65, 0x65, 0x72, 0x5f, 0x74, 0x79, 0x70, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x21, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, + 0x2e, 0x76, 0x69, 0x64, 0x65, 0x6f, 0x2e, 0x73, 0x66, 0x75, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, + 0x73, 0x2e, 0x50, 0x65, 0x65, 0x72, 0x54, 0x79, 0x70, 0x65, 0x52, 0x08, 0x70, 0x65, 0x65, 0x72, + 0x54, 0x79, 0x70, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x63, 0x65, 0x5f, 0x63, 0x61, 0x6e, 0x64, + 0x69, 0x64, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x69, 0x63, 0x65, + 0x43, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x61, 0x74, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x65, 0x73, + 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, + 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x70, 0x0a, 0x0c, 0x41, 0x75, 0x64, 0x69, + 0x6f, 0x42, 0x69, 0x74, 0x72, 0x61, 0x74, 0x65, 0x12, 0x46, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x2e, 0x76, 0x69, 0x64, 0x65, 0x6f, 0x2e, 0x73, 0x66, 0x75, 0x2e, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x41, 0x75, 0x64, 0x69, 0x6f, 0x42, 0x69, 0x74, 0x72, 0x61, 0x74, 0x65, @@ -3475,7 +3474,7 @@ var file_video_sfu_models_models_proto_goTypes = []interface{}{ (*PublishOption)(nil), // 23: stream.video.sfu.models.PublishOption (*Codec)(nil), // 24: stream.video.sfu.models.Codec (*ICETrickle)(nil), // 25: stream.video.sfu.models.ICETrickle - (*AudioBitrateProfiles)(nil), // 26: stream.video.sfu.models.AudioBitrateProfiles + (*AudioBitrate)(nil), // 26: stream.video.sfu.models.AudioBitrate (*TrackInfo)(nil), // 27: stream.video.sfu.models.TrackInfo (*Error)(nil), // 28: stream.video.sfu.models.Error (*ClientDetails)(nil), // 29: stream.video.sfu.models.ClientDetails @@ -3511,9 +3510,9 @@ var file_video_sfu_models_models_proto_depIdxs = []int32{ 3, // 14: stream.video.sfu.models.PublishOption.track_type:type_name -> stream.video.sfu.models.TrackType 24, // 15: stream.video.sfu.models.PublishOption.codec:type_name -> stream.video.sfu.models.Codec 20, // 16: stream.video.sfu.models.PublishOption.video_dimension:type_name -> stream.video.sfu.models.VideoDimension - 26, // 17: stream.video.sfu.models.PublishOption.audio_bitrate_profiles:type_name -> stream.video.sfu.models.AudioBitrateProfiles + 26, // 17: stream.video.sfu.models.PublishOption.audio_bitrate_profiles:type_name -> stream.video.sfu.models.AudioBitrate 0, // 18: stream.video.sfu.models.ICETrickle.peer_type:type_name -> stream.video.sfu.models.PeerType - 5, // 19: stream.video.sfu.models.AudioBitrateProfiles.profile:type_name -> stream.video.sfu.models.AudioBitrateProfile + 5, // 19: stream.video.sfu.models.AudioBitrate.profile:type_name -> stream.video.sfu.models.AudioBitrateProfile 3, // 20: stream.video.sfu.models.TrackInfo.track_type:type_name -> stream.video.sfu.models.TrackType 21, // 21: stream.video.sfu.models.TrackInfo.layers:type_name -> stream.video.sfu.models.VideoLayer 24, // 22: stream.video.sfu.models.TrackInfo.codec:type_name -> stream.video.sfu.models.Codec @@ -3677,7 +3676,7 @@ func file_video_sfu_models_models_proto_init() { } } file_video_sfu_models_models_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AudioBitrateProfiles); i { + switch v := v.(*AudioBitrate); i { case 0: return &v.state case 1: diff --git a/protobuf/video/sfu/models/models.proto b/protobuf/video/sfu/models/models.proto index 9097f15b..fdd274aa 100644 --- a/protobuf/video/sfu/models/models.proto +++ b/protobuf/video/sfu/models/models.proto @@ -182,7 +182,7 @@ message PublishOption { bool use_single_layer = 9; // Audio bitrate profiles for different audio quality profiles. - repeated AudioBitrateProfiles audio_bitrate_profiles = 10; + repeated AudioBitrate audio_bitrate_profiles = 10; } message Codec { @@ -199,7 +199,7 @@ message ICETrickle { string session_id = 3; } -message AudioBitrateProfiles { +message AudioBitrate { AudioBitrateProfile profile = 1; int32 bitrate = 2; } diff --git a/protobuf/video/sfu/models/models_vtproto.pb.go b/protobuf/video/sfu/models/models_vtproto.pb.go index 0ebd674c..c062945c 100644 --- a/protobuf/video/sfu/models/models_vtproto.pb.go +++ b/protobuf/video/sfu/models/models_vtproto.pb.go @@ -806,7 +806,7 @@ func (m *ICETrickle) MarshalToSizedBufferVT(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *AudioBitrateProfiles) MarshalVT() (dAtA []byte, err error) { +func (m *AudioBitrate) MarshalVT() (dAtA []byte, err error) { if m == nil { return nil, nil } @@ -819,12 +819,12 @@ func (m *AudioBitrateProfiles) MarshalVT() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *AudioBitrateProfiles) MarshalToVT(dAtA []byte) (int, error) { +func (m *AudioBitrate) MarshalToVT(dAtA []byte) (int, error) { size := m.SizeVT() return m.MarshalToSizedBufferVT(dAtA[:size]) } -func (m *AudioBitrateProfiles) MarshalToSizedBufferVT(dAtA []byte) (int, error) { +func (m *AudioBitrate) MarshalToSizedBufferVT(dAtA []byte) (int, error) { if m == nil { return 0, nil } @@ -2154,7 +2154,7 @@ func (m *ICETrickle) SizeVT() (n int) { return n } -func (m *AudioBitrateProfiles) SizeVT() (n int) { +func (m *AudioBitrate) SizeVT() (n int) { if m == nil { return 0 } @@ -4203,7 +4203,7 @@ func (m *PublishOption) UnmarshalVT(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.AudioBitrateProfiles = append(m.AudioBitrateProfiles, &AudioBitrateProfiles{}) + m.AudioBitrateProfiles = append(m.AudioBitrateProfiles, &AudioBitrate{}) if err := m.AudioBitrateProfiles[len(m.AudioBitrateProfiles)-1].UnmarshalVT(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -4549,7 +4549,7 @@ func (m *ICETrickle) UnmarshalVT(dAtA []byte) error { } return nil } -func (m *AudioBitrateProfiles) UnmarshalVT(dAtA []byte) error { +func (m *AudioBitrate) UnmarshalVT(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4572,10 +4572,10 @@ func (m *AudioBitrateProfiles) UnmarshalVT(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: AudioBitrateProfiles: wiretype end group for non-group") + return fmt.Errorf("proto: AudioBitrate: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: AudioBitrateProfiles: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: AudioBitrate: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: