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:
@ -41,11 +41,11 @@ size_t AudioEncoderCopyRed::MaxEncodedBytes() const {
|
||||
return 2 * speech_encoder_->MaxEncodedBytes();
|
||||
}
|
||||
|
||||
int AudioEncoderCopyRed::Num10MsFramesInNextPacket() const {
|
||||
size_t AudioEncoderCopyRed::Num10MsFramesInNextPacket() const {
|
||||
return speech_encoder_->Num10MsFramesInNextPacket();
|
||||
}
|
||||
|
||||
int AudioEncoderCopyRed::Max10MsFramesInAPacket() const {
|
||||
size_t AudioEncoderCopyRed::Max10MsFramesInAPacket() const {
|
||||
return speech_encoder_->Max10MsFramesInAPacket();
|
||||
}
|
||||
|
||||
|
||||
@ -40,8 +40,8 @@ class AudioEncoderCopyRed : public AudioEncoder {
|
||||
int NumChannels() const override;
|
||||
size_t MaxEncodedBytes() const override;
|
||||
int RtpTimestampRateHz() const override;
|
||||
int Num10MsFramesInNextPacket() const override;
|
||||
int Max10MsFramesInAPacket() const override;
|
||||
size_t Num10MsFramesInNextPacket() const override;
|
||||
size_t Max10MsFramesInAPacket() const override;
|
||||
int GetTargetBitrate() const override;
|
||||
void SetTargetBitrate(int bits_per_second) override;
|
||||
void SetProjectedPacketLossRate(double fraction) override;
|
||||
|
||||
@ -113,13 +113,13 @@ TEST_F(AudioEncoderCopyRedTest, CheckNumChannelsPropagation) {
|
||||
}
|
||||
|
||||
TEST_F(AudioEncoderCopyRedTest, CheckFrameSizePropagation) {
|
||||
EXPECT_CALL(mock_encoder_, Num10MsFramesInNextPacket()).WillOnce(Return(17));
|
||||
EXPECT_EQ(17, red_->Num10MsFramesInNextPacket());
|
||||
EXPECT_CALL(mock_encoder_, Num10MsFramesInNextPacket()).WillOnce(Return(17U));
|
||||
EXPECT_EQ(17U, red_->Num10MsFramesInNextPacket());
|
||||
}
|
||||
|
||||
TEST_F(AudioEncoderCopyRedTest, CheckMaxFrameSizePropagation) {
|
||||
EXPECT_CALL(mock_encoder_, Max10MsFramesInAPacket()).WillOnce(Return(17));
|
||||
EXPECT_EQ(17, red_->Max10MsFramesInAPacket());
|
||||
EXPECT_CALL(mock_encoder_, Max10MsFramesInAPacket()).WillOnce(Return(17U));
|
||||
EXPECT_EQ(17U, red_->Max10MsFramesInAPacket());
|
||||
}
|
||||
|
||||
TEST_F(AudioEncoderCopyRedTest, CheckSetBitratePropagation) {
|
||||
|
||||
Reference in New Issue
Block a user