admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused struct from ProtectionBitrateCalculator.

Browse Source 
Remove unused forward declarations.

Bug: none
Change-Id: Ie6f656efa83c889103ace4c9245e2fe3d8f7a547
Reviewed-on: https://webrtc-review.googlesource.com/29060
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21111}
This commit is contained in:
Åsa Persson 2017-12-04 14:13:56 +01:00 committed by Commit Bot
parent e72e8e617c
commit c74d8da339
4 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/video_coding/protection_bitrate_calculator.cc
View File

@ -14,18 +14,6 @@ namespace webrtc {
using rtc::CritScope;
struct ProtectionBitrateCalculator::EncodedFrameSample {
EncodedFrameSample(size_t size_bytes,
uint32_t timestamp,
int64_t time_complete_ms)
: size_bytes(size_bytes),
timestamp(timestamp),
time_complete_ms(time_complete_ms) {}
size_t size_bytes;
uint32_t timestamp;
int64_t time_complete_ms;
};
ProtectionBitrateCalculator::ProtectionBitrateCalculator(
Clock* clock,
VCMProtectionCallback* protection_callback)

1
modules/video_coding/protection_bitrate_calculator.h
View File

@ -61,7 +61,6 @@ class ProtectionBitrateCalculator {
void UpdateWithEncodedData(const EncodedImage& encoded_image);
private:
struct EncodedFrameSample;
enum { kBitrateAverageWinMs = 1000 };
Clock* const clock_;

4
video/rtp_video_stream_receiver.h
View File

@ -39,16 +39,12 @@
namespace webrtc {
class NackModule;
class PacedSender;
class PacketRouter;
class ProcessThread;
class ReceiveStatistics;
class ReceiveStatisticsProxy;
class RemoteNtpTimeEstimator;
class RtcpRttStats;
class RtpHeaderParser;
class RtpPacketReceived;
class RTPPayloadRegistry;
class RtpReceiver;
class Transport;
class UlpfecReceiver;

12
video/video_stream_encoder_unittest.cc
View File

@ -561,10 +561,10 @@ class VideoStreamEncoderTest : public ::testing::Test {
void WaitForEncodedFrame(uint32_t expected_width,
uint32_t expected_height) {
EXPECT_TRUE(encoded_frame_event_.Wait(kDefaultTimeoutMs));
CheckLastFrameSizeMathces(expected_width, expected_height);
CheckLastFrameSizeMatches(expected_width, expected_height);
}
void CheckLastFrameSizeMathces(uint32_t expected_width,
void CheckLastFrameSizeMatches(uint32_t expected_width,
uint32_t expected_height) {
uint32_t width = 0;
uint32_t height = 0;
@ -2485,7 +2485,7 @@ TEST_F(VideoStreamEncoderTest,
if (!WaitForFrame(kFrameTimeoutMs)) {
++num_frames_dropped;
} else {
sink_.CheckLastFrameSizeMathces(kFrameWidth, kFrameHeight);
sink_.CheckLastFrameSizeMatches(kFrameWidth, kFrameHeight);
}
}
@ -2504,7 +2504,7 @@ TEST_F(VideoStreamEncoderTest,
if (!WaitForFrame(kFrameTimeoutMs)) {
++num_frames_dropped;
} else {
sink_.CheckLastFrameSizeMathces(kFrameWidth, kFrameHeight);
sink_.CheckLastFrameSizeMatches(kFrameWidth, kFrameHeight);
}
}
EXPECT_NEAR(num_frames_dropped, max_framerate_ - (max_framerate_ * 4 / 9),
@ -2520,7 +2520,7 @@ TEST_F(VideoStreamEncoderTest,
if (!WaitForFrame(kFrameTimeoutMs)) {
++num_frames_dropped;
} else {
sink_.CheckLastFrameSizeMathces(kFrameWidth, kFrameHeight);
sink_.CheckLastFrameSizeMatches(kFrameWidth, kFrameHeight);
}
}
EXPECT_NEAR(num_frames_dropped, max_framerate_ - (max_framerate_ * 2 / 3),
@ -2536,7 +2536,7 @@ TEST_F(VideoStreamEncoderTest,
if (!WaitForFrame(kFrameTimeoutMs)) {
++num_frames_dropped;
} else {
sink_.CheckLastFrameSizeMathces(kFrameWidth, kFrameHeight);
sink_.CheckLastFrameSizeMatches(kFrameWidth, kFrameHeight);
}
}
EXPECT_NEAR(num_frames_dropped, 0, kErrorMargin);