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}
diff --git a/webrtc/modules/video_coding/receiver.cc b/webrtc/modules/video_coding/receiver.cc
index b516694..5eeca04 100644
--- a/webrtc/modules/video_coding/receiver.cc
+++ b/webrtc/modules/video_coding/receiver.cc
@@ -110,9 +110,7 @@
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 dbef62a..7aa9795 100644
--- a/webrtc/modules/video_coding/receiver.h
+++ b/webrtc/modules/video_coding/receiver.h
@@ -63,9 +63,7 @@
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 d05957f..863dac3 100644
--- a/webrtc/modules/video_coding/receiver_unittest.cc
+++ b/webrtc/modules/video_coding/receiver_unittest.cc
@@ -29,9 +29,6 @@
class TestVCMReceiver : public ::testing::Test {
protected:
- enum { kWidth = 640 };
- enum { kHeight = 480 };
-
TestVCMReceiver()
: clock_(new SimulatedClock(0)),
timing_(clock_.get()),
@@ -48,7 +45,7 @@
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 @@
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 @@
EXPECT_TRUE(packet_available);
if (!packet_available)
return; // Return here to avoid crashes below.
- receiver_->InsertPacket(packet, 640, 480);
+ receiver_->InsertPacket(packet);
}
std::queue<TimestampPair> timestamps_;
diff --git a/webrtc/modules/video_coding/video_receiver.cc b/webrtc/modules/video_coding/video_receiver.cc
index a832e21..d42d053 100644
--- a/webrtc/modules/video_coding/video_receiver.cc
+++ b/webrtc/modules/video_coding/video_receiver.cc
@@ -410,8 +410,7 @@
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.