Skip to content

Commit d692e95

Browse files
committed
Fixed missing mutex locks on bitrate warning function
1 parent b4ade5c commit d692e95

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

mumble/audio.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,8 +534,11 @@ static void audio_transmission_bitrate_warning(MumbleClient *client, size_t leng
534534
if (current) {
535535
// Cleanup any active audio transmissions
536536
while (current != NULL) {
537-
audio_transmission_unreference(client->l, current->data);
537+
uv_mutex_lock(&client->inner_mutex);
538+
AudioStream *sound = current->data;
538539
current = current->next;
540+
uv_mutex_unlock(&client->inner_mutex);
541+
audio_transmission_unreference(client->l, sound);
539542
}
540543
}
541544

mumble/encoder.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,8 @@ const luaL_Reg mumble_encoder[] = {
398398
{"setComplexity", encoder_setComplexity},
399399
{"getBitRate", encoder_getBitRate},
400400
{"setBitRate", encoder_setBitRate},
401+
{"getBitrate", encoder_getBitRate},
402+
{"setBitrate", encoder_setBitRate},
401403
{"getVBR", encoder_getVBR},
402404
{"setVBR", encoder_setVBR},
403405
{"getVBRConstraint", encoder_getVBRConstraint},

mumble/mumble.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,6 @@ uint64_t mumble_adjust_audio_bandwidth(MumbleClient *client) {
813813
opus_encoder_ctl(client->encoder, OPUS_SET_PACKET_LOSS_PERC(10)); // Increase loss resilience
814814
opus_encoder_ctl(client->encoder, OPUS_SET_INBAND_FEC(1)); // Helps recover lost packets
815815
opus_encoder_ctl(client->encoder, OPUS_SET_DTX(1)); // Enable DTX to reduce bitrate usage
816-
817816
}
818817
}
819818

mumble/user.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,9 @@ const luaL_Reg mumble_user[] = {
680680
{"requestTextureBlob", user_requestTextureBlob},
681681
{"requestCommentBlob", user_requestCommentBlob},
682682
{"startRecord", user_startRecord},
683+
{"startRecording", user_startRecord},
683684
{"stopRecord", user_stopRecord},
685+
{"stopRecording", user_stopRecord},
684686
{"isBeingRecorded", user_isBeingRecorded},
685687
{"contextAction", user_contextAction},
686688

0 commit comments

Comments
 (0)