diff options
author | mannol <eniz_vukovic@hotmail.com> | 2015-03-28 03:36:31 +0100 |
---|---|---|
committer | mannol <eniz_vukovic@hotmail.com> | 2015-03-28 03:36:31 +0100 |
commit | e65efc8936ee029f735a22105843335c18026ad2 (patch) | |
tree | 8a0d832ced409e035946c6a05e548ddeea3668cb /toxav/codec.h | |
parent | 9bd20e874141640ed592b2a1ac32e96f57c12510 (diff) |
Improvement in test and removed some bloat from CS
Diffstat (limited to 'toxav/codec.h')
-rw-r--r-- | toxav/codec.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/toxav/codec.h b/toxav/codec.h index 5e015f39..526a80d5 100644 --- a/toxav/codec.h +++ b/toxav/codec.h | |||
@@ -107,25 +107,15 @@ typedef struct CSSession_s { | |||
107 | 107 | ||
108 | /* audio encoding */ | 108 | /* audio encoding */ |
109 | OpusEncoder *audio_encoder; | 109 | OpusEncoder *audio_encoder; |
110 | int32_t encoder_channels; | ||
111 | int32_t encoder_sample_rate; | ||
112 | 110 | ||
113 | /* audio decoding */ | 111 | /* audio decoding */ |
114 | OpusDecoder *audio_decoder; | 112 | OpusDecoder *audio_decoder; |
115 | int32_t decoder_channels; | 113 | int32_t last_packet_channels; |
116 | int32_t decoder_sample_rate; | ||
117 | int32_t last_pack_channels; | ||
118 | int32_t last_packet_sampling_rate; | 114 | int32_t last_packet_sampling_rate; |
119 | int32_t last_packet_frame_duration; | 115 | int32_t last_packet_frame_duration; |
120 | struct JitterBuffer_s *j_buf; | 116 | struct JitterBuffer_s *j_buf; |
121 | 117 | ||
122 | 118 | ||
123 | /* Voice activity detection */ | ||
124 | uint32_t EVAD_tolerance; /* In frames */ | ||
125 | uint32_t EVAD_tolerance_cr; | ||
126 | |||
127 | |||
128 | |||
129 | /* OTHER | 119 | /* OTHER |
130 | * | 120 | * |
131 | * | 121 | * |
@@ -171,10 +161,8 @@ void cs_disable_video_receiving(CSSession* cs); | |||
171 | * AUDIO HANDLING | 161 | * AUDIO HANDLING |
172 | */ | 162 | */ |
173 | int cs_set_sending_audio_bitrate(CSSession* cs, int32_t rate); | 163 | int cs_set_sending_audio_bitrate(CSSession* cs, int32_t rate); |
174 | int cs_set_sending_audio_sampling_rate(CSSession* cs, int32_t rate); | ||
175 | int cs_set_sending_audio_channels(CSSession* cs, int32_t count); | ||
176 | 164 | ||
177 | int cs_enable_audio_sending(CSSession* cs, uint32_t bitrate, int channels); | 165 | int cs_enable_audio_sending(CSSession* cs, uint32_t bitrate); |
178 | int cs_enable_audio_receiving(CSSession* cs); | 166 | int cs_enable_audio_receiving(CSSession* cs); |
179 | 167 | ||
180 | void cs_disable_audio_sending(CSSession* cs); | 168 | void cs_disable_audio_sending(CSSession* cs); |