Update a ton of audio code to use size_t more correctly and in general reduce
use of int16_t/uint16_t. This is the upshot of a recommendation by henrik.lundin and kwiberg on an original small change ( https://webrtc-codereview.appspot.com/42569004/#ps1 ) to stop using int16_t just because values could fit in it, and is similar in nature to a previous "mass change to use size_t more" ( https://webrtc-codereview.appspot.com/23129004/ ) which also needed to be split up for review but to land all at once, since, like adding "const", such changes tend to cause a lot of transitive effects. This was be reviewed and approved in pieces: https://codereview.webrtc.org/1224093003 https://codereview.webrtc.org/1224123002 https://codereview.webrtc.org/1224163002 https://codereview.webrtc.org/1225133003 https://codereview.webrtc.org/1225173002 https://codereview.webrtc.org/1227163003 https://codereview.webrtc.org/1227203003 https://codereview.webrtc.org/1227213002 https://codereview.webrtc.org/1227893002 https://codereview.webrtc.org/1228793004 https://codereview.webrtc.org/1228803003 https://codereview.webrtc.org/1228823002 https://codereview.webrtc.org/1228823003 https://codereview.webrtc.org/1228843002 https://codereview.webrtc.org/1230693002 https://codereview.webrtc.org/1231713002 The change is being landed as TBR to all the folks who reviewed the above. BUG=chromium:81439 TEST=none R=andrew@webrtc.org, pbos@webrtc.org TBR=aluebs, andrew, asapersson, henrika, hlundin, jan.skoglund, kwiberg, minyue, pbos, pthatcher Review URL: https://codereview.webrtc.org/1230503003 . Cr-Commit-Position: refs/heads/master@{#9768}
This commit is contained in:
@ -23,10 +23,10 @@ bool AudioEncoderPcm16B::Config::IsOk() const {
|
||||
return AudioEncoderPcm::Config::IsOk();
|
||||
}
|
||||
|
||||
int16_t AudioEncoderPcm16B::EncodeCall(const int16_t* audio,
|
||||
size_t input_len,
|
||||
uint8_t* encoded) {
|
||||
return WebRtcPcm16b_Encode(audio, static_cast<int16_t>(input_len), encoded);
|
||||
size_t AudioEncoderPcm16B::EncodeCall(const int16_t* audio,
|
||||
size_t input_len,
|
||||
uint8_t* encoded) {
|
||||
return WebRtcPcm16b_Encode(audio, input_len, encoded);
|
||||
}
|
||||
|
||||
int AudioEncoderPcm16B::BytesPerSample() const {
|
||||
|
||||
@ -31,9 +31,9 @@ class AudioEncoderPcm16B final : public AudioEncoderPcm {
|
||||
: AudioEncoderPcm(config, config.sample_rate_hz) {}
|
||||
|
||||
protected:
|
||||
int16_t EncodeCall(const int16_t* audio,
|
||||
size_t input_len,
|
||||
uint8_t* encoded) override;
|
||||
size_t EncodeCall(const int16_t* audio,
|
||||
size_t input_len,
|
||||
uint8_t* encoded) override;
|
||||
|
||||
int BytesPerSample() const override;
|
||||
};
|
||||
|
||||
@ -14,6 +14,8 @@
|
||||
* Define the fixpoint numeric formats
|
||||
*/
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#include "webrtc/typedefs.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
@ -36,9 +38,9 @@ extern "C" {
|
||||
* Always equal to twice the len input parameter.
|
||||
*/
|
||||
|
||||
int16_t WebRtcPcm16b_Encode(const int16_t* speech,
|
||||
int16_t len,
|
||||
uint8_t* encoded);
|
||||
size_t WebRtcPcm16b_Encode(const int16_t* speech,
|
||||
size_t len,
|
||||
uint8_t* encoded);
|
||||
|
||||
/****************************************************************************
|
||||
* WebRtcPcm16b_Decode(...)
|
||||
@ -55,9 +57,9 @@ int16_t WebRtcPcm16b_Encode(const int16_t* speech,
|
||||
* Returned value : Samples in speech
|
||||
*/
|
||||
|
||||
int16_t WebRtcPcm16b_Decode(const uint8_t* encoded,
|
||||
int16_t len,
|
||||
int16_t* speech);
|
||||
size_t WebRtcPcm16b_Decode(const uint8_t* encoded,
|
||||
size_t len,
|
||||
int16_t* speech);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
@ -12,10 +12,10 @@
|
||||
|
||||
#include "webrtc/typedefs.h"
|
||||
|
||||
int16_t WebRtcPcm16b_Encode(const int16_t* speech,
|
||||
int16_t len,
|
||||
uint8_t* encoded) {
|
||||
int i;
|
||||
size_t WebRtcPcm16b_Encode(const int16_t* speech,
|
||||
size_t len,
|
||||
uint8_t* encoded) {
|
||||
size_t i;
|
||||
for (i = 0; i < len; ++i) {
|
||||
uint16_t s = speech[i];
|
||||
encoded[2 * i] = s >> 8;
|
||||
@ -24,10 +24,10 @@ int16_t WebRtcPcm16b_Encode(const int16_t* speech,
|
||||
return 2 * len;
|
||||
}
|
||||
|
||||
int16_t WebRtcPcm16b_Decode(const uint8_t* encoded,
|
||||
int16_t len,
|
||||
int16_t* speech) {
|
||||
int i;
|
||||
size_t WebRtcPcm16b_Decode(const uint8_t* encoded,
|
||||
size_t len,
|
||||
int16_t* speech) {
|
||||
size_t i;
|
||||
for (i = 0; i < len / 2; ++i)
|
||||
speech[i] = encoded[2 * i] << 8 | encoded[2 * i + 1];
|
||||
return len / 2;
|
||||
|
||||
Reference in New Issue
Block a user