Extending models to support MP3 audio encoding in egress (#1220)

Extending models to support MP3 audio encoding in egress
---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
Milos Pesic
2025-09-22 11:51:39 +02:00
committed by GitHub
parent 3476f457ed
commit 3d859a5bf0
5 changed files with 54 additions and 43 deletions
+6 -2
View File
@@ -41,6 +41,7 @@ const (
EncodedFileType_DEFAULT_FILETYPE EncodedFileType = 0 // file type chosen based on codecs
EncodedFileType_MP4 EncodedFileType = 1
EncodedFileType_OGG EncodedFileType = 2
EncodedFileType_MP3 EncodedFileType = 3
)
// Enum value maps for EncodedFileType.
@@ -49,11 +50,13 @@ var (
0: "DEFAULT_FILETYPE",
1: "MP4",
2: "OGG",
3: "MP3",
}
EncodedFileType_value = map[string]int32{
"DEFAULT_FILETYPE": 0,
"MP4": 1,
"OGG": 2,
"MP3": 3,
}
)
@@ -4168,11 +4171,12 @@ const file_livekit_egress_proto_rawDesc = "" +
"\x03gcp\x18\x03 \x01(\v2\x12.livekit.GCPUploadH\x00R\x03gcp\x120\n" +
"\x05azure\x18\x04 \x01(\v2\x18.livekit.AzureBlobUploadH\x00R\x05azure\x12/\n" +
"\x06aliOSS\x18\x06 \x01(\v2\x15.livekit.AliOSSUploadH\x00R\x06aliOSSB\b\n" +
"\x06output*9\n" +
"\x06output*B\n" +
"\x0fEncodedFileType\x12\x14\n" +
"\x10DEFAULT_FILETYPE\x10\x00\x12\a\n" +
"\x03MP4\x10\x01\x12\a\n" +
"\x03OGG\x10\x02*N\n" +
"\x03OGG\x10\x02\x12\a\n" +
"\x03MP3\x10\x03*N\n" +
"\x15SegmentedFileProtocol\x12#\n" +
"\x1fDEFAULT_SEGMENTED_FILE_PROTOCOL\x10\x00\x12\x10\n" +
"\fHLS_PROTOCOL\x10\x01*/\n" +
+39 -39
View File
@@ -2754,7 +2754,7 @@ func (s *egressServer) PathPrefix() string {
}
var twirpFileDescriptor1 = []byte{
// 3274 bytes of a gzipped FileDescriptorProto
// 3278 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xc9, 0x73, 0x1b, 0xc7,
0xd5, 0xe7, 0x60, 0xc7, 0xc3, 0xc2, 0x61, 0x93, 0xa2, 0x20, 0xca, 0x9f, 0x25, 0x43, 0x5e, 0x64,
0xda, 0xa6, 0xf8, 0x89, 0xb2, 0x2c, 0xcb, 0x9f, 0xfd, 0x05, 0x24, 0x87, 0x24, 0x6c, 0x90, 0x40,
@@ -2922,42 +2922,42 @@ var twirpFileDescriptor1 = []byte{
0x2e, 0x01, 0x9a, 0xea, 0x2f, 0x12, 0x70, 0xa3, 0x36, 0xa2, 0xce, 0x54, 0xe2, 0x09, 0xbd, 0xcc,
0x28, 0xd7, 0x78, 0x7d, 0x4c, 0x5c, 0xe3, 0xf5, 0x31, 0x79, 0xb9, 0x97, 0x99, 0x98, 0xb7, 0x95,
0xd4, 0xe5, 0xdf, 0x56, 0xc2, 0x4f, 0x1c, 0x3f, 0x4b, 0xc0, 0x2c, 0x5b, 0x9c, 0x50, 0x0e, 0xfc,
0x8f, 0xef, 0x43, 0x2e, 0x7f, 0x2a, 0x0b, 0xc6, 0xe0, 0x89, 0x03, 0x2d, 0x80, 0xba, 0xa9, 0x6d,
0xd5, 0xf6, 0x1b, 0x1d, 0x63, 0xab, 0xde, 0xd0, 0x3a, 0x3f, 0x68, 0xb1, 0x60, 0x98, 0x85, 0xe4,
0x6e, 0xeb, 0x91, 0xaa, 0xb0, 0x8f, 0xe6, 0xf6, 0xb6, 0x9a, 0x58, 0xde, 0x83, 0x1b, 0xb1, 0xed,
0x7c, 0x74, 0x0f, 0xee, 0x78, 0x06, 0xda, 0xda, 0xf6, 0xae, 0xb6, 0xd7, 0xd1, 0x36, 0xb9, 0x29,
0xa3, 0xa5, 0x37, 0x3b, 0xcd, 0x8d, 0x66, 0x43, 0x9d, 0x41, 0x2a, 0x14, 0x77, 0x1a, 0xed, 0x80,
0xa2, 0x2c, 0x3f, 0x88, 0x3c, 0x27, 0xc8, 0xa6, 0x62, 0x1e, 0xd2, 0xf5, 0xbd, 0x4d, 0xed, 0x6b,
0x75, 0x06, 0x95, 0x20, 0xdf, 0xa9, 0xef, 0x6a, 0xed, 0x4e, 0x6d, 0xb7, 0xa5, 0x2a, 0xcb, 0x87,
0x30, 0x1b, 0xe9, 0x48, 0xa2, 0x45, 0x40, 0xf5, 0xdd, 0xda, 0xb6, 0x66, 0xb4, 0xf7, 0xb7, 0xb6,
0xea, 0x5f, 0x1b, 0x9e, 0xe6, 0x12, 0x2c, 0x4e, 0xd0, 0x43, 0x66, 0xd0, 0x1d, 0xb8, 0x3d, 0xc1,
0xdb, 0x6b, 0xee, 0x69, 0x46, 0xf3, 0x99, 0xa6, 0x3f, 0xd7, 0xeb, 0x1d, 0x4d, 0x4d, 0x2c, 0x7f,
0xea, 0x65, 0x47, 0x7f, 0x86, 0xa1, 0x25, 0x0a, 0x4d, 0x29, 0x07, 0x29, 0xbd, 0xc3, 0x4d, 0x66,
0x21, 0xd9, 0xd6, 0x3b, 0x6a, 0x62, 0x79, 0x1f, 0x0a, 0xa1, 0x7f, 0x8b, 0x21, 0x04, 0x65, 0x4f,
0x6f, 0xb7, 0xfe, 0x75, 0x7d, 0x6f, 0x5b, 0x9d, 0x61, 0x2e, 0x6f, 0xee, 0xd7, 0x1a, 0xc6, 0xc6,
0x4e, 0x6d, 0x6f, 0x4f, 0x6b, 0x18, 0xb5, 0x6d, 0x6d, 0xaf, 0xa3, 0x2a, 0xcc, 0xe5, 0x49, 0x7a,
0xa3, 0xa3, 0xe9, 0x7b, 0x35, 0xee, 0xd1, 0x1f, 0x15, 0xb8, 0x11, 0x7b, 0x6e, 0xf9, 0xb2, 0x3e,
0x7c, 0xfc, 0xc8, 0xf8, 0xe4, 0xe1, 0x6a, 0xcb, 0x58, 0x5b, 0x95, 0x0b, 0xed, 0x53, 0x1e, 0xaf,
0xaa, 0x0a, 0x9a, 0x83, 0x12, 0xa7, 0xfc, 0xef, 0xea, 0x13, 0x21, 0x94, 0x88, 0x90, 0x1e, 0xaf,
0xaa, 0x49, 0x74, 0x0b, 0x6e, 0xb4, 0x9a, 0x7a, 0x47, 0xaf, 0xd5, 0x3b, 0xc6, 0x84, 0xc9, 0xd4,
0x19, 0xac, 0xc7, 0xab, 0x6a, 0x9a, 0x79, 0x3d, 0xc9, 0xf2, 0x7f, 0x24, 0x73, 0x16, 0xef, 0xf1,
0xaa, 0x9a, 0x5d, 0xfe, 0x95, 0x02, 0xc5, 0x70, 0x1d, 0x82, 0xe6, 0x61, 0x56, 0xdb, 0xd6, 0xb5,
0x76, 0xdb, 0x68, 0x77, 0x6a, 0x7a, 0x47, 0xac, 0xd5, 0x1c, 0x94, 0x24, 0x51, 0x26, 0x69, 0x25,
0x44, 0xd2, 0xf6, 0x36, 0x99, 0x54, 0x22, 0xa4, 0xba, 0xd1, 0xdc, 0x6d, 0x35, 0xb4, 0x8e, 0xa6,
0x26, 0x43, 0x72, 0x32, 0x8b, 0xa7, 0xd8, 0x6e, 0x78, 0xd6, 0xd6, 0x9b, 0x7a, 0x47, 0xdb, 0x54,
0xd3, 0xa8, 0x02, 0x0b, 0x92, 0xd6, 0xa8, 0xef, 0xd6, 0x3b, 0x86, 0xae, 0xd5, 0x36, 0x58, 0xfe,
0xcf, 0x2c, 0x7f, 0x09, 0x6a, 0xb4, 0xbe, 0x62, 0x33, 0xf2, 0x9c, 0x6c, 0xee, 0xeb, 0x1b, 0x9a,
0xc1, 0x0e, 0x8b, 0xf1, 0x5c, 0x5b, 0x17, 0x90, 0x8b, 0xe1, 0xb5, 0x37, 0xbf, 0x52, 0x95, 0x87,
0xbf, 0x4c, 0x43, 0x46, 0x46, 0xa0, 0x0e, 0x54, 0xf8, 0x7f, 0xa0, 0x62, 0xaa, 0x14, 0x74, 0x91,
0x1a, 0x66, 0x29, 0xae, 0x86, 0x45, 0xdf, 0x63, 0x90, 0x35, 0x5d, 0xea, 0x17, 0x2e, 0xe8, 0xec,
0x62, 0x26, 0xde, 0x42, 0x0b, 0x16, 0xb9, 0x85, 0xe9, 0x54, 0xf2, 0xea, 0xfa, 0x26, 0xde, 0xe2,
0x33, 0xb8, 0xc5, 0x2d, 0xc6, 0x95, 0x32, 0xe8, 0x42, 0x95, 0x4e, 0xbc, 0xdd, 0x4d, 0x50, 0x03,
0xbb, 0xd2, 0xdc, 0x79, 0x15, 0x4f, 0xbc, 0x95, 0x1a, 0x14, 0xc3, 0xdd, 0x16, 0x14, 0xa4, 0x99,
0x98, 0x26, 0xcc, 0x2b, 0x4c, 0x88, 0x68, 0x31, 0x65, 0x62, 0xa2, 0xf5, 0x12, 0x6f, 0x42, 0x03,
0x08, 0xba, 0x16, 0x28, 0x48, 0x96, 0x53, 0x1d, 0x93, 0xa5, 0xdb, 0xb1, 0x3c, 0xd9, 0xe6, 0xf8,
0x9c, 0xdd, 0xc7, 0xbd, 0xde, 0x05, 0x0a, 0xdf, 0x8b, 0x23, 0x0d, 0x8d, 0x58, 0x2f, 0xd6, 0xb7,
0x7e, 0x78, 0xef, 0xc8, 0xa2, 0xc7, 0xa3, 0x83, 0x95, 0xae, 0x33, 0x78, 0x20, 0x05, 0x1e, 0x78,
0x9d, 0x47, 0x8f, 0xf0, 0xdb, 0x44, 0xa9, 0x61, 0x9d, 0xe2, 0xaf, 0x44, 0x3b, 0x99, 0x3a, 0x7f,
0x4d, 0x94, 0xe5, 0xf8, 0xe9, 0x53, 0x4e, 0x38, 0xc8, 0x70, 0x95, 0xb5, 0x7f, 0x05, 0x00, 0x00,
0xff, 0xff, 0x89, 0xb9, 0x85, 0xdc, 0xf9, 0x2b, 0x00, 0x00,
0x8f, 0xef, 0x43, 0x2e, 0xaf, 0xcb, 0x82, 0x31, 0x78, 0xe2, 0x40, 0x0b, 0xa0, 0x6e, 0x6a, 0x5b,
0xb5, 0xfd, 0x46, 0xc7, 0xd8, 0xaa, 0x37, 0xb4, 0xce, 0x0f, 0x5a, 0x2c, 0x18, 0x66, 0x21, 0xb9,
0xdb, 0x7a, 0xa4, 0x2a, 0xec, 0xa3, 0xb9, 0xbd, 0xad, 0x26, 0x04, 0x65, 0x4d, 0x4d, 0x2e, 0xef,
0xc1, 0x8d, 0xd8, 0xbe, 0x3e, 0xba, 0x07, 0x77, 0x3c, 0x4b, 0x6d, 0x6d, 0x7b, 0x57, 0xdb, 0xeb,
0x68, 0x9b, 0xdc, 0xa6, 0xd1, 0xd2, 0x9b, 0x9d, 0xe6, 0x46, 0xb3, 0xa1, 0xce, 0x20, 0x15, 0x8a,
0x3b, 0x8d, 0x76, 0x40, 0x51, 0x96, 0x1f, 0x44, 0xde, 0x15, 0x64, 0x77, 0x31, 0x0f, 0xe9, 0xfa,
0xde, 0xa6, 0xf6, 0xb5, 0x3a, 0x83, 0x4a, 0x90, 0xef, 0xd4, 0x77, 0xb5, 0x76, 0xa7, 0xb6, 0xdb,
0x52, 0x95, 0xe5, 0x43, 0x98, 0x8d, 0xb4, 0x26, 0xd1, 0x22, 0xa0, 0xfa, 0x6e, 0x6d, 0x5b, 0x33,
0xda, 0xfb, 0x5b, 0x5b, 0xf5, 0xaf, 0x0d, 0x4f, 0x73, 0x09, 0x16, 0x27, 0xe8, 0x21, 0x33, 0xe8,
0x0e, 0xdc, 0x9e, 0xe0, 0xed, 0x35, 0xf7, 0x34, 0xa3, 0xf9, 0x4c, 0xd3, 0x9f, 0xeb, 0xf5, 0x8e,
0xa6, 0x26, 0x96, 0x3f, 0xf5, 0xd2, 0xa4, 0x3f, 0xc3, 0xd0, 0x5a, 0x85, 0xa6, 0x94, 0x83, 0x94,
0xde, 0xe1, 0x26, 0xb3, 0x90, 0x6c, 0xeb, 0x1d, 0x35, 0xb1, 0xbc, 0x0f, 0x85, 0xd0, 0xdf, 0xc6,
0x10, 0x82, 0xb2, 0xa7, 0xb7, 0x5b, 0xff, 0xba, 0xbe, 0xb7, 0xad, 0xce, 0x30, 0x97, 0x37, 0xf7,
0x6b, 0x0d, 0x63, 0x63, 0xa7, 0xb6, 0xb7, 0xa7, 0x35, 0x8c, 0xda, 0xb6, 0xb6, 0xd7, 0x51, 0x15,
0xe6, 0xf2, 0x24, 0xbd, 0xd1, 0xd1, 0xf4, 0xbd, 0x1a, 0xf7, 0xe8, 0x8f, 0x0a, 0xdc, 0x88, 0x3d,
0xc0, 0x7c, 0x59, 0x1f, 0x3e, 0x7e, 0x64, 0x7c, 0xf2, 0x70, 0xb5, 0x65, 0xac, 0xad, 0xca, 0x85,
0xf6, 0x29, 0x8f, 0x57, 0x55, 0x05, 0xcd, 0x41, 0x89, 0x53, 0xfe, 0x77, 0xf5, 0x89, 0x10, 0x4a,
0x44, 0x48, 0x8f, 0x57, 0xd5, 0x24, 0xba, 0x05, 0x37, 0x5a, 0x4d, 0xbd, 0xa3, 0xd7, 0xea, 0x1d,
0x63, 0xc2, 0x64, 0xea, 0x0c, 0xd6, 0xe3, 0x55, 0x35, 0xcd, 0xbc, 0x9e, 0x64, 0xf9, 0x3f, 0x92,
0x39, 0x8b, 0xf7, 0x78, 0x55, 0xcd, 0x2e, 0xff, 0x4a, 0x81, 0x62, 0xb8, 0x20, 0x41, 0xf3, 0x30,
0xab, 0x6d, 0xeb, 0x5a, 0xbb, 0x6d, 0xb4, 0x3b, 0x35, 0xbd, 0x23, 0xd6, 0x6a, 0x0e, 0x4a, 0x92,
0x28, 0xb3, 0xb5, 0x12, 0x22, 0x69, 0x7b, 0x9b, 0x4c, 0x2a, 0x11, 0x52, 0xdd, 0x68, 0xee, 0xb6,
0x1a, 0x5a, 0x47, 0x53, 0x93, 0x21, 0x39, 0x99, 0xce, 0x53, 0x6c, 0x37, 0x3c, 0x6b, 0xeb, 0x4d,
0xbd, 0xa3, 0x6d, 0xaa, 0x69, 0x54, 0x81, 0x05, 0x49, 0x6b, 0xd4, 0x77, 0xeb, 0x1d, 0x43, 0xd7,
0x6a, 0x1b, 0xec, 0x22, 0x90, 0x59, 0xfe, 0x12, 0xd4, 0x68, 0xa1, 0xc5, 0x66, 0xe4, 0x39, 0xd9,
0xdc, 0xd7, 0x37, 0x34, 0x83, 0x9d, 0x1a, 0xe3, 0xb9, 0xb6, 0x2e, 0x20, 0x17, 0xc3, 0x6b, 0x6f,
0x7e, 0xa5, 0x2a, 0x0f, 0x7f, 0x99, 0x86, 0x8c, 0x0c, 0x45, 0x1d, 0xa8, 0xf0, 0x3f, 0x43, 0xc5,
0x94, 0x2b, 0xe8, 0x22, 0xc5, 0xcc, 0x52, 0x5c, 0x31, 0x8b, 0xbe, 0xc7, 0x20, 0x6b, 0xba, 0xd4,
0xaf, 0x60, 0xd0, 0xd9, 0x55, 0x4d, 0xbc, 0x85, 0x16, 0x2c, 0x72, 0x0b, 0xd3, 0x39, 0xe5, 0xd5,
0x85, 0x4e, 0xbc, 0xc5, 0x67, 0x70, 0x8b, 0x5b, 0x8c, 0xab, 0x69, 0xd0, 0x85, 0x4a, 0x9e, 0x78,
0xbb, 0x9b, 0xa0, 0x06, 0x76, 0xa5, 0xb9, 0xf3, 0x4a, 0x9f, 0x78, 0x2b, 0x35, 0x28, 0x86, 0xdb,
0x2e, 0x28, 0xc8, 0x37, 0x31, 0xdd, 0x98, 0x57, 0x98, 0x10, 0xd1, 0x62, 0xca, 0xc4, 0x44, 0x0f,
0x26, 0xde, 0x84, 0x06, 0x10, 0xb4, 0x2f, 0x50, 0x90, 0x35, 0xa7, 0x5a, 0x27, 0x4b, 0xb7, 0x63,
0x79, 0xb2, 0xdf, 0xf1, 0x39, 0xbb, 0x98, 0x7b, 0x4d, 0x0c, 0x14, 0xbe, 0x20, 0x47, 0x3a, 0x1b,
0xb1, 0x5e, 0xac, 0x6f, 0xfd, 0xf0, 0xde, 0x91, 0x45, 0x8f, 0x47, 0x07, 0x2b, 0x5d, 0x67, 0xf0,
0x40, 0x0a, 0x3c, 0xf0, 0x5a, 0x90, 0x1e, 0xe1, 0xb7, 0x89, 0x52, 0xc3, 0x3a, 0xc5, 0x5f, 0x89,
0xbe, 0x32, 0x75, 0xfe, 0x9a, 0x28, 0xcb, 0xf1, 0xd3, 0xa7, 0x9c, 0x70, 0x90, 0xe1, 0x2a, 0x6b,
0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xa9, 0x24, 0x1b, 0x02, 0x2c, 0x00, 0x00,
}
+7 -2
View File
@@ -42,6 +42,7 @@ const (
AudioCodec_DEFAULT_AC AudioCodec = 0
AudioCodec_OPUS AudioCodec = 1
AudioCodec_AAC AudioCodec = 2
AudioCodec_AC_MP3 AudioCodec = 3
)
// Enum value maps for AudioCodec.
@@ -50,11 +51,13 @@ var (
0: "DEFAULT_AC",
1: "OPUS",
2: "AAC",
3: "AC_MP3",
}
AudioCodec_value = map[string]int32{
"DEFAULT_AC": 0,
"OPUS": 1,
"AAC": 2,
"AC_MP3": 3,
}
)
@@ -6198,13 +6201,15 @@ const file_livekit_models_proto_rawDesc = "" +
"signingKey\"F\n" +
"\x14SubscribedAudioCodec\x12\x14\n" +
"\x05codec\x18\x01 \x01(\tR\x05codec\x12\x18\n" +
"\aenabled\x18\x02 \x01(\bR\aenabled*/\n" +
"\aenabled\x18\x02 \x01(\bR\aenabled*;\n" +
"\n" +
"AudioCodec\x12\x0e\n" +
"\n" +
"DEFAULT_AC\x10\x00\x12\b\n" +
"\x04OPUS\x10\x01\x12\a\n" +
"\x03AAC\x10\x02*V\n" +
"\x03AAC\x10\x02\x12\n" +
"\n" +
"\x06AC_MP3\x10\x03*V\n" +
"\n" +
"VideoCodec\x12\x0e\n" +
"\n" +
+1
View File
@@ -157,6 +157,7 @@ enum EncodedFileType {
DEFAULT_FILETYPE = 0; // file type chosen based on codecs
MP4 = 1;
OGG = 2;
MP3 = 3;
}
message EncodedFileOutput {
+1
View File
@@ -68,6 +68,7 @@ enum AudioCodec {
DEFAULT_AC = 0;
OPUS = 1;
AAC = 2;
AC_MP3 = 3;
}
enum VideoCodec {