| Index: webrtc/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h
|
| diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h b/webrtc/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h
|
| index 8482a8c70e9070f26bf231dc0bea1456e99efe17..291687608256c2c1738d69b6a2536f407d224326 100644
|
| --- a/webrtc/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h
|
| +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/bandwidth_estimator.h
|
| @@ -104,10 +104,10 @@ extern "C" {
|
| enum IsacSamplingRate encoderSamplingFreq);
|
|
|
| /* Returns the bandwidth/jitter estimation code (integer 0...23) to put in the sending iSAC payload */
|
| - uint16_t WebRtcIsac_GetDownlinkBwJitIndexImpl(
|
| - BwEstimatorstr* bwest_str,
|
| - int16_t* bottleneckIndex,
|
| - int16_t* jitterInfo,
|
| + void WebRtcIsac_GetDownlinkBwJitIndexImpl(
|
| + BwEstimatorstr* bwest_str,
|
| + int16_t* bottleneckIndex,
|
| + int16_t* jitterInfo,
|
| enum IsacSamplingRate decoderSamplingFreq);
|
|
|
| /* Returns the bandwidth estimation (in bps) */
|
| @@ -119,14 +119,21 @@ extern "C" {
|
| const BwEstimatorstr *bwest_str);
|
|
|
| /* Returns the bandwidth that iSAC should send with in bps */
|
| - void WebRtcIsac_GetUplinkBandwidth(
|
| - const BwEstimatorstr* bwest_str,
|
| - int32_t* bitRate);
|
| + int32_t WebRtcIsac_GetUplinkBandwidth(const BwEstimatorstr* bwest_str);
|
|
|
| /* Returns the max delay value from the other side in ms */
|
| int32_t WebRtcIsac_GetUplinkMaxDelay(
|
| const BwEstimatorstr *bwest_str);
|
|
|
| + /* Fills in an IsacExternalBandwidthInfo struct. */
|
| + void WebRtcIsacBw_GetBandwidthInfo(
|
| + BwEstimatorstr* bwest_str,
|
| + enum IsacSamplingRate decoder_sample_rate_hz,
|
| + IsacBandwidthInfo* bwinfo);
|
| +
|
| + /* Uses the values from an IsacExternalBandwidthInfo struct. */
|
| + void WebRtcIsacBw_SetBandwidthInfo(BwEstimatorstr* bwest_str,
|
| + const IsacBandwidthInfo* bwinfo);
|
|
|
| /*
|
| * update amount of data in bottle neck buffer and burst handling
|
|
|