Merge commit 'aae086cc650e42eec1eea8db28cd01fa868d7f90'
This commit is contained in:
12
external/toxcore/c-toxcore/toxav/audio.c
vendored
12
external/toxcore/c-toxcore/toxav/audio.c
vendored
@ -25,8 +25,6 @@ static bool reconfigure_audio_encoder(const Logger *log, OpusEncoder **e, uint32
|
||||
uint8_t new_ch, uint32_t *old_br, uint32_t *old_sr, uint8_t *old_ch);
|
||||
static bool reconfigure_audio_decoder(ACSession *ac, uint32_t sampling_rate, uint8_t channels);
|
||||
|
||||
|
||||
|
||||
ACSession *ac_new(Mono_Time *mono_time, const Logger *log, ToxAV *av, uint32_t friend_number,
|
||||
toxav_audio_receive_frame_cb *cb, void *cb_data)
|
||||
{
|
||||
@ -194,9 +192,9 @@ void ac_iterate(ACSession *ac)
|
||||
free(temp_audio_buffer);
|
||||
}
|
||||
|
||||
int ac_queue_message(Mono_Time *mono_time, void *acp, struct RTPMessage *msg)
|
||||
int ac_queue_message(Mono_Time *mono_time, void *cs, struct RTPMessage *msg)
|
||||
{
|
||||
ACSession *ac = (ACSession *)acp;
|
||||
ACSession *ac = (ACSession *)cs;
|
||||
|
||||
if (ac == nullptr || msg == nullptr) {
|
||||
free(msg);
|
||||
@ -242,8 +240,6 @@ int ac_reconfigure_encoder(ACSession *ac, uint32_t bit_rate, uint32_t sampling_r
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
struct JitterBuffer {
|
||||
struct RTPMessage **queue;
|
||||
uint32_t size;
|
||||
@ -365,7 +361,6 @@ static OpusEncoder *create_audio_encoder(const Logger *log, uint32_t bit_rate, u
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Rates from 500 to 512000 bits per second are meaningful as well as the special
|
||||
* values OPUS_BITRATE_AUTO and OPUS_BITRATE_MAX. The value OPUS_BITRATE_MAX can
|
||||
@ -382,7 +377,6 @@ static OpusEncoder *create_audio_encoder(const Logger *log, uint32_t bit_rate, u
|
||||
goto FAILURE;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Configures the encoder's use of inband forward error correction.
|
||||
* Note:
|
||||
@ -398,7 +392,6 @@ static OpusEncoder *create_audio_encoder(const Logger *log, uint32_t bit_rate, u
|
||||
goto FAILURE;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Configures the encoder's expected packet loss percentage.
|
||||
* Higher values with trigger progressively more loss resistant behavior in
|
||||
@ -418,7 +411,6 @@ static OpusEncoder *create_audio_encoder(const Logger *log, uint32_t bit_rate, u
|
||||
goto FAILURE;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Configures the encoder's computational complexity.
|
||||
*
|
||||
|
Reference in New Issue
Block a user