From 95348f76638543d074ceed1ecee5fb5cc2137a69 Mon Sep 17 00:00:00 2001 From: Johan Ahlers Date: Tue, 28 Jun 2016 11:11:28 +0200 Subject: [PATCH] Remove unused parameters from VCMReceiver::InsertPacket(). BUG= R=pbos@webrtc.org Review URL: https://codereview.webrtc.org/2094183004 . Cr-Commit-Position: refs/heads/master@{#13309} --- webrtc/modules/video_coding/receiver.cc | 4 +--- webrtc/modules/video_coding/receiver.h | 4 +--- webrtc/modules/video_coding/receiver_unittest.cc | 9 +++------ webrtc/modules/video_coding/video_receiver.cc | 3 +-- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/webrtc/modules/video_coding/receiver.cc b/webrtc/modules/video_coding/receiver.cc index b516694119..5eeca046ca 100644 --- a/webrtc/modules/video_coding/receiver.cc +++ b/webrtc/modules/video_coding/receiver.cc @@ -110,9 +110,7 @@ void VCMReceiver::Process() { jitter_buffer_.Process(); } -int32_t VCMReceiver::InsertPacket(const VCMPacket& packet, - uint16_t frame_width, - uint16_t frame_height) { +int32_t VCMReceiver::InsertPacket(const VCMPacket& packet) { // Insert the packet into the jitter buffer. The packet can either be empty or // contain media at this point. bool retransmitted = false; diff --git a/webrtc/modules/video_coding/receiver.h b/webrtc/modules/video_coding/receiver.h index dbef62a716..7aa979513e 100644 --- a/webrtc/modules/video_coding/receiver.h +++ b/webrtc/modules/video_coding/receiver.h @@ -63,9 +63,7 @@ class VCMReceiver { void Reset(); void UpdateRtt(int64_t rtt); - int32_t InsertPacket(const VCMPacket& packet, - uint16_t frame_width, - uint16_t frame_height); + int32_t InsertPacket(const VCMPacket& packet); VCMEncodedFrame* FrameForDecoding(uint16_t max_wait_time_ms, int64_t* next_render_time_ms, bool prefer_late_decoding); diff --git a/webrtc/modules/video_coding/receiver_unittest.cc b/webrtc/modules/video_coding/receiver_unittest.cc index d05957f6f0..863dac344e 100644 --- a/webrtc/modules/video_coding/receiver_unittest.cc +++ b/webrtc/modules/video_coding/receiver_unittest.cc @@ -29,9 +29,6 @@ namespace webrtc { class TestVCMReceiver : public ::testing::Test { protected: - enum { kWidth = 640 }; - enum { kHeight = 480 }; - TestVCMReceiver() : clock_(new SimulatedClock(0)), timing_(clock_.get()), @@ -48,7 +45,7 @@ class TestVCMReceiver : public ::testing::Test { EXPECT_TRUE(packet_available); if (!packet_available) return kGeneralError; // Return here to avoid crashes below. - return receiver_.InsertPacket(packet, kWidth, kHeight); + return receiver_.InsertPacket(packet); } int32_t InsertPacketAndPop(int index) { @@ -57,7 +54,7 @@ class TestVCMReceiver : public ::testing::Test { EXPECT_TRUE(packet_available); if (!packet_available) return kGeneralError; // Return here to avoid crashes below. - return receiver_.InsertPacket(packet, kWidth, kHeight); + return receiver_.InsertPacket(packet); } int32_t InsertFrame(FrameType frame_type, bool complete) { @@ -338,7 +335,7 @@ class SimulatedClockWithFrames : public SimulatedClock { EXPECT_TRUE(packet_available); if (!packet_available) return; // Return here to avoid crashes below. - receiver_->InsertPacket(packet, 640, 480); + receiver_->InsertPacket(packet); } std::queue timestamps_; diff --git a/webrtc/modules/video_coding/video_receiver.cc b/webrtc/modules/video_coding/video_receiver.cc index a832e2180b..d42d053770 100644 --- a/webrtc/modules/video_coding/video_receiver.cc +++ b/webrtc/modules/video_coding/video_receiver.cc @@ -410,8 +410,7 @@ int32_t VideoReceiver::IncomingPacket(const uint8_t* incomingPayload, payloadLength = 0; } const VCMPacket packet(incomingPayload, payloadLength, rtpInfo); - int32_t ret = _receiver.InsertPacket(packet, rtpInfo.type.Video.width, - rtpInfo.type.Video.height); + int32_t ret = _receiver.InsertPacket(packet); // TODO(holmer): Investigate if this somehow should use the key frame // request scheduling to throttle the requests.