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

Revert of Adding "first packet received" notification to PeerConnectionObserver. (patchset #5 id:80001 of https://codereview.webrtc.org/1581693006/ )

Browse Source 
Reason for revert:
onFirstMediaPacketReceived() breaks bot.

Original issue's description:
> Adding "first packet received" notification to PeerConnectionObserver.
>
> R=glaznev@webrtc.org, pthatcher@webrtc.org, tkchin@webrtc.org
>
> Committed: https://crrev.com/42265a8cc3b3f3db4aa2c29005aed2fb4393adef
> Cr-Commit-Position: refs/heads/master@{#11401}
>
> Committed: https://crrev.com/08a6eab75e13613183509d91d3892c1db57f6fc5
> Cr-Commit-Position: refs/heads/master@{#11404}

TBR=pthatcher@webrtc.org,tkchin@webrtc.org,glaznev@webrtc.org,deadbeef@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

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

Cr-Commit-Position: refs/heads/master@{#11415}
This commit is contained in:
terelius
2016-01-28 05:06:07 -08:00
committed by Commit bot
parent e73afbaf17
commit 6043f2e5d6
15 changed files with 0 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
talk/app/webrtc/peerconnection_unittest.cc
View File

@ -251,7 +251,6 @@ class PeerConnectionTestClient : public webrtc::PeerConnectionObserver,
signaling_message_receiver_->ReceiveIceMessage(
candidate->sdp_mid(), candidate->sdp_mline_index(), ice_sdp);
}
void OnFirstMediaPacketReceived() override { received_media_packet_ = true; }
// MediaStreamInterface callback
void OnChanged() override {
@ -387,8 +386,6 @@ class PeerConnectionTestClient : public webrtc::PeerConnectionObserver,
return true;
}
bool received_media_packet() const { return received_media_packet_; }
void OnIceComplete() override { LOG(INFO) << id_ << "OnIceComplete"; }
void OnDataChannel(DataChannelInterface* data_channel) override {
@ -927,10 +924,6 @@ class PeerConnectionTestClient : public webrtc::PeerConnectionObserver,
rtc::scoped_refptr<DataChannelInterface> data_channel_;
rtc::scoped_ptr<MockDataChannelObserver> data_observer_;
// "true" if the PeerConnection indicated that a packet was received,
// through PeerConnectionObserverInterface.
bool received_media_packet_ = false;
};
class P2PTestConductor : public testing::Test {
@ -1111,12 +1104,6 @@ class P2PTestConductor : public testing::Test {
EXPECT_TRUE_WAIT(FramesNotPending(audio_frame_count, video_frame_count),
kMaxWaitForFramesMs);
if (audio_frame_count != -1 || video_frame_count != -1) {
EXPECT_TRUE_WAIT(initiating_client_->received_media_packet(),
kMaxWaitForFramesMs);
EXPECT_TRUE_WAIT(receiving_client_->received_media_packet(),
kMaxWaitForFramesMs);
}
}
void SetupAndVerifyDtlsCall() {