zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused parameters from VCMReceiver::InsertPacket().

Browse Source 
BUG=
R=pbos@webrtc.org

Review URL: https://codereview.webrtc.org/2094183004 .

Cr-Commit-Position: refs/heads/master@{#13309}
This commit is contained in:
Johan Ahlers
2016-06-28 11:11:28 +02:00
parent 098e6c5d0a
commit 95348f7663
4 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/video_coding/receiver.cc
View File

@ -110,9 +110,7 @@ void VCMReceiver::Process() {
jitter_buffer_.Process(); jitter_buffer_.Process();
} }
int32_t VCMReceiver::InsertPacket(const VCMPacket& packet, int32_t VCMReceiver::InsertPacket(const VCMPacket& packet) {
uint16_t frame_width,
uint16_t frame_height) {
// Insert the packet into the jitter buffer. The packet can either be empty or // Insert the packet into the jitter buffer. The packet can either be empty or
// contain media at this point. // contain media at this point.
bool retransmitted = false; bool retransmitted = false;

4
webrtc/modules/video_coding/receiver.h
View File

@ -63,9 +63,7 @@ class VCMReceiver {
void Reset(); void Reset();
void UpdateRtt(int64_t rtt); void UpdateRtt(int64_t rtt);
int32_t InsertPacket(const VCMPacket& packet, int32_t InsertPacket(const VCMPacket& packet);
uint16_t frame_width,
uint16_t frame_height);
VCMEncodedFrame* FrameForDecoding(uint16_t max_wait_time_ms, VCMEncodedFrame* FrameForDecoding(uint16_t max_wait_time_ms,
int64_t* next_render_time_ms, int64_t* next_render_time_ms,
bool prefer_late_decoding); bool prefer_late_decoding);

9
webrtc/modules/video_coding/receiver_unittest.cc
View File

@ -29,9 +29,6 @@ namespace webrtc {
class TestVCMReceiver : public ::testing::Test { class TestVCMReceiver : public ::testing::Test {
protected: protected:
enum { kWidth = 640 };
enum { kHeight = 480 };
TestVCMReceiver() TestVCMReceiver()
: clock_(new SimulatedClock(0)), : clock_(new SimulatedClock(0)),
timing_(clock_.get()), timing_(clock_.get()),
@ -48,7 +45,7 @@ class TestVCMReceiver : public ::testing::Test {
EXPECT_TRUE(packet_available); EXPECT_TRUE(packet_available);
if (!packet_available) if (!packet_available)
return kGeneralError; // Return here to avoid crashes below. return kGeneralError; // Return here to avoid crashes below.
return receiver_.InsertPacket(packet, kWidth, kHeight); return receiver_.InsertPacket(packet);
} }
int32_t InsertPacketAndPop(int index) { int32_t InsertPacketAndPop(int index) {
@ -57,7 +54,7 @@ class TestVCMReceiver : public ::testing::Test {
EXPECT_TRUE(packet_available); EXPECT_TRUE(packet_available);
if (!packet_available) if (!packet_available)
return kGeneralError; // Return here to avoid crashes below. 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) { int32_t InsertFrame(FrameType frame_type, bool complete) {
@ -338,7 +335,7 @@ class SimulatedClockWithFrames : public SimulatedClock {
EXPECT_TRUE(packet_available); EXPECT_TRUE(packet_available);
if (!packet_available) if (!packet_available)
return; // Return here to avoid crashes below. return; // Return here to avoid crashes below.
receiver_->InsertPacket(packet, 640, 480); receiver_->InsertPacket(packet);
} }
std::queue<TimestampPair> timestamps_; std::queue<TimestampPair> timestamps_;

3
webrtc/modules/video_coding/video_receiver.cc
View File

@ -410,8 +410,7 @@ int32_t VideoReceiver::IncomingPacket(const uint8_t* incomingPayload,
payloadLength = 0; payloadLength = 0;
} }
const VCMPacket packet(incomingPayload, payloadLength, rtpInfo); const VCMPacket packet(incomingPayload, payloadLength, rtpInfo);
int32_t ret = _receiver.InsertPacket(packet, rtpInfo.type.Video.width, int32_t ret = _receiver.InsertPacket(packet);
rtpInfo.type.Video.height);
// TODO(holmer): Investigate if this somehow should use the key frame // TODO(holmer): Investigate if this somehow should use the key frame
// request scheduling to throttle the requests. // request scheduling to throttle the requests.