generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove the deprecated GetStats method from PeerConnectionInterface.

Browse Source 
R=fischman@webrtc.org, wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/8879004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5634 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jiayl@webrtc.org 2014-03-03 21:30:06 +00:00
parent 80bbf4c312
commit db41b4dbcd
7 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
talk/app/webrtc/java/jni/peerconnection_jni.cc
View File

@ -2216,7 +2216,9 @@ JOW(bool, PeerConnection_nativeGetStats)(
talk_base::scoped_refptr<StatsObserverWrapper> observer(
new talk_base::RefCountedObject<StatsObserverWrapper>(jni, j_observer));
return ExtractNativePC(jni, j_pc)->GetStats(
observer, reinterpret_cast<MediaStreamTrackInterface*>(native_track));
observer,
reinterpret_cast<MediaStreamTrackInterface*>(native_track),
PeerConnectionInterface::kStatsOutputLevelStandard);
}
JOW(jobject, PeerConnection_signalingState)(JNIEnv* jni, jobject j_pc) {

5
talk/app/webrtc/peerconnection.cc
View File

@ -447,11 +447,6 @@ talk_base::scoped_refptr<DtmfSenderInterface> PeerConnection::CreateDtmfSender(
return DtmfSenderProxy::Create(signaling_thread(), sender.get());
}
bool PeerConnection::GetStats(StatsObserver* observer,
webrtc::MediaStreamTrackInterface* track) {
return GetStats(observer, track, kStatsOutputLevelStandard);
}
bool PeerConnection::GetStats(StatsObserver* observer,
MediaStreamTrackInterface* track,
StatsOutputLevel level) {

2
talk/app/webrtc/peerconnection.h
View File

@ -74,8 +74,6 @@ class PeerConnection : public PeerConnectionInterface,
virtual talk_base::scoped_refptr<DataChannelInterface> CreateDataChannel(
const std::string& label,
const DataChannelInit* config);
virtual bool GetStats(StatsObserver* observer,
webrtc::MediaStreamTrackInterface* track);
virtual bool GetStats(StatsObserver* observer,
webrtc::MediaStreamTrackInterface* track,
StatsOutputLevel level);

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

@ -79,6 +79,7 @@ using webrtc::MockCreateSessionDescriptionObserver;
using webrtc::MockDataChannelObserver;
using webrtc::MockSetSessionDescriptionObserver;
using webrtc::MockStatsObserver;
using webrtc::PeerConnectionInterface;
using webrtc::SessionDescriptionInterface;
using webrtc::StreamCollectionInterface;
@ -328,7 +329,8 @@ class PeerConnectionTestClientBase
int GetAudioOutputLevelStats(webrtc::MediaStreamTrackInterface* track) {
talk_base::scoped_refptr<MockStatsObserver>
observer(new talk_base::RefCountedObject<MockStatsObserver>());
EXPECT_TRUE(peer_connection_->GetStats(observer, track));
EXPECT_TRUE(peer_connection_->GetStats(
observer, track, PeerConnectionInterface::kStatsOutputLevelStandard));
EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs);
return observer->AudioOutputLevel();
}
@ -336,7 +338,8 @@ class PeerConnectionTestClientBase
int GetAudioInputLevelStats() {
talk_base::scoped_refptr<MockStatsObserver>
observer(new talk_base::RefCountedObject<MockStatsObserver>());
EXPECT_TRUE(peer_connection_->GetStats(observer, NULL));
EXPECT_TRUE(peer_connection_->GetStats(
observer, NULL, PeerConnectionInterface::kStatsOutputLevelStandard));
EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs);
return observer->AudioInputLevel();
}
@ -344,7 +347,8 @@ class PeerConnectionTestClientBase
int GetBytesReceivedStats(webrtc::MediaStreamTrackInterface* track) {
talk_base::scoped_refptr<MockStatsObserver>
observer(new talk_base::RefCountedObject<MockStatsObserver>());
EXPECT_TRUE(peer_connection_->GetStats(observer, track));
EXPECT_TRUE(peer_connection_->GetStats(
observer, track, PeerConnectionInterface::kStatsOutputLevelStandard));
EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs);
return observer->BytesReceived();
}
@ -352,7 +356,8 @@ class PeerConnectionTestClientBase
int GetBytesSentStats(webrtc::MediaStreamTrackInterface* track) {
talk_base::scoped_refptr<MockStatsObserver>
observer(new talk_base::RefCountedObject<MockStatsObserver>());
EXPECT_TRUE(peer_connection_->GetStats(observer, track));
EXPECT_TRUE(peer_connection_->GetStats(
observer, track, PeerConnectionInterface::kStatsOutputLevelStandard));
EXPECT_TRUE_WAIT(observer->called(), kMaxWaitMs);
return observer->BytesSent();
}

4
talk/app/webrtc/peerconnectioninterface.h
View File

@ -199,10 +199,6 @@ class PeerConnectionInterface : public talk_base::RefCountInterface {
virtual talk_base::scoped_refptr<DtmfSenderInterface> CreateDtmfSender(
AudioTrackInterface* track) = 0;
// TODO(jiayl): remove the old API once all Chrome overrides are updated.
virtual bool GetStats(StatsObserver* observer,
MediaStreamTrackInterface* track) = 0;
virtual bool GetStats(StatsObserver* observer,
MediaStreamTrackInterface* track,
StatsOutputLevel level) = 0;

3
talk/app/webrtc/peerconnectioninterface_unittest.cc
View File

@ -410,7 +410,8 @@ class PeerConnectionInterfaceTest : public testing::Test {
bool DoGetStats(MediaStreamTrackInterface* track) {
talk_base::scoped_refptr<MockStatsObserver> observer(
new talk_base::RefCountedObject<MockStatsObserver>());
if (!pc_->GetStats(observer, track))
if (!pc_->GetStats(
observer, track, PeerConnectionInterface::kStatsOutputLevelStandard))
return false;
EXPECT_TRUE_WAIT(observer->called(), kTimeout);
return observer->called();

1
talk/app/webrtc/peerconnectionproxy.h
View File

@ -44,7 +44,6 @@ BEGIN_PROXY_MAP(PeerConnection)
PROXY_METHOD1(void, RemoveStream, MediaStreamInterface*)
PROXY_METHOD1(talk_base::scoped_refptr<DtmfSenderInterface>,
CreateDtmfSender, AudioTrackInterface*)
PROXY_METHOD2(bool, GetStats, StatsObserver*, MediaStreamTrackInterface*)
PROXY_METHOD3(bool, GetStats, StatsObserver*,
MediaStreamTrackInterface*,
StatsOutputLevel)