| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * libjingle | 2  * libjingle | 
| 3  * Copyright 2014 Google Inc. | 3  * Copyright 2014 Google Inc. | 
| 4  * | 4  * | 
| 5  * Redistribution and use in source and binary forms, with or without | 5  * Redistribution and use in source and binary forms, with or without | 
| 6  * modification, are permitted provided that the following conditions are met: | 6  * modification, are permitted provided that the following conditions are met: | 
| 7  * | 7  * | 
| 8  *  1. Redistributions of source code must retain the above copyright notice, | 8  *  1. Redistributions of source code must retain the above copyright notice, | 
| 9  *     this list of conditions and the following disclaimer. | 9  *     this list of conditions and the following disclaimer. | 
| 10  *  2. Redistributions in binary form must reproduce the above copyright notice, | 10  *  2. Redistributions in binary form must reproduce the above copyright notice, | 
| (...skipping 11 matching lines...) Expand all  Loading... | 
| 22  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 
| 23  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 
| 24  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 
| 25  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 
| 26  */ | 26  */ | 
| 27 | 27 | 
| 28 #include <stdio.h> | 28 #include <stdio.h> | 
| 29 | 29 | 
| 30 #include <algorithm> | 30 #include <algorithm> | 
| 31 | 31 | 
| 32 #include "talk/app/webrtc/statscollector.h" | 32 #include "webrtc/api/statscollector.h" | 
| 33 | 33 | 
| 34 #include "talk/app/webrtc/mediastream.h" |  | 
| 35 #include "talk/app/webrtc/mediastreaminterface.h" |  | 
| 36 #include "talk/app/webrtc/mediastreamtrack.h" |  | 
| 37 #include "talk/app/webrtc/peerconnection.h" |  | 
| 38 #include "talk/app/webrtc/peerconnectionfactory.h" |  | 
| 39 #include "talk/app/webrtc/test/fakedatachannelprovider.h" |  | 
| 40 #include "talk/app/webrtc/videotrack.h" |  | 
| 41 #include "talk/session/media/channelmanager.h" | 34 #include "talk/session/media/channelmanager.h" | 
| 42 #include "testing/gmock/include/gmock/gmock.h" | 35 #include "testing/gmock/include/gmock/gmock.h" | 
| 43 #include "testing/gtest/include/gtest/gtest.h" | 36 #include "testing/gtest/include/gtest/gtest.h" | 
|  | 37 #include "webrtc/api/mediastream.h" | 
|  | 38 #include "webrtc/api/mediastreaminterface.h" | 
|  | 39 #include "webrtc/api/mediastreamtrack.h" | 
|  | 40 #include "webrtc/api/peerconnection.h" | 
|  | 41 #include "webrtc/api/peerconnectionfactory.h" | 
|  | 42 #include "webrtc/api/test/fakedatachannelprovider.h" | 
|  | 43 #include "webrtc/api/videotrack.h" | 
| 44 #include "webrtc/base/base64.h" | 44 #include "webrtc/base/base64.h" | 
| 45 #include "webrtc/base/fakesslidentity.h" | 45 #include "webrtc/base/fakesslidentity.h" | 
| 46 #include "webrtc/base/gunit.h" | 46 #include "webrtc/base/gunit.h" | 
| 47 #include "webrtc/base/network.h" | 47 #include "webrtc/base/network.h" | 
| 48 #include "webrtc/media/base/fakemediaengine.h" | 48 #include "webrtc/media/base/fakemediaengine.h" | 
| 49 #include "webrtc/p2p/base/faketransportcontroller.h" | 49 #include "webrtc/p2p/base/faketransportcontroller.h" | 
| 50 | 50 | 
| 51 using rtc::scoped_ptr; | 51 using rtc::scoped_ptr; | 
| 52 using testing::_; | 52 using testing::_; | 
| 53 using testing::DoAll; | 53 using testing::DoAll; | 
| (...skipping 1693 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1747   cricket::VoiceSenderInfo new_voice_sender_info; | 1747   cricket::VoiceSenderInfo new_voice_sender_info; | 
| 1748   InitVoiceSenderInfo(&new_voice_sender_info); | 1748   InitVoiceSenderInfo(&new_voice_sender_info); | 
| 1749   cricket::VoiceMediaInfo new_stats_read; | 1749   cricket::VoiceMediaInfo new_stats_read; | 
| 1750   reports.clear(); | 1750   reports.clear(); | 
| 1751   SetupAndVerifyAudioTrackStats( | 1751   SetupAndVerifyAudioTrackStats( | 
| 1752       new_audio_track.get(), stream_.get(), &stats, &voice_channel, kVcName, | 1752       new_audio_track.get(), stream_.get(), &stats, &voice_channel, kVcName, | 
| 1753       media_channel, &new_voice_sender_info, NULL, &new_stats_read, &reports); | 1753       media_channel, &new_voice_sender_info, NULL, &new_stats_read, &reports); | 
| 1754 } | 1754 } | 
| 1755 | 1755 | 
| 1756 }  // namespace webrtc | 1756 }  // namespace webrtc | 
| OLD | NEW | 
|---|