Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Side by Side Diff: talk/app/webrtc/test/peerconnectiontestwrapper.h

Issue 1236023010: In PeerConnectionTestWrapper, put audio input on a separate thread. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Use "nullptr" instead of "NULL" Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2013 Google Inc. 3 * Copyright 2013 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 15 matching lines...) Expand all
26 */ 26 */
27 27
28 #ifndef TALK_APP_WEBRTC_TEST_PEERCONNECTIONTESTWRAPPER_H_ 28 #ifndef TALK_APP_WEBRTC_TEST_PEERCONNECTIONTESTWRAPPER_H_
29 #define TALK_APP_WEBRTC_TEST_PEERCONNECTIONTESTWRAPPER_H_ 29 #define TALK_APP_WEBRTC_TEST_PEERCONNECTIONTESTWRAPPER_H_
30 30
31 #include "talk/app/webrtc/peerconnectioninterface.h" 31 #include "talk/app/webrtc/peerconnectioninterface.h"
32 #include "talk/app/webrtc/test/fakeaudiocapturemodule.h" 32 #include "talk/app/webrtc/test/fakeaudiocapturemodule.h"
33 #include "talk/app/webrtc/test/fakeconstraints.h" 33 #include "talk/app/webrtc/test/fakeconstraints.h"
34 #include "talk/app/webrtc/test/fakevideotrackrenderer.h" 34 #include "talk/app/webrtc/test/fakevideotrackrenderer.h"
35 #include "webrtc/base/sigslot.h" 35 #include "webrtc/base/sigslot.h"
36 #include "webrtc/base/thread.h"
37 36
38 namespace webrtc { 37 namespace webrtc {
39 class PortAllocatorFactoryInterface; 38 class PortAllocatorFactoryInterface;
40 } 39 }
41 40
42 class PeerConnectionTestWrapper 41 class PeerConnectionTestWrapper
43 : public webrtc::PeerConnectionObserver, 42 : public webrtc::PeerConnectionObserver,
44 public webrtc::CreateSessionDescriptionObserver, 43 public webrtc::CreateSessionDescriptionObserver,
45 public sigslot::has_slots<> { 44 public sigslot::has_slots<> {
46 public: 45 public:
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface> 112 rtc::scoped_refptr<webrtc::PortAllocatorFactoryInterface>
114 allocator_factory_; 113 allocator_factory_;
115 rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_; 114 rtc::scoped_refptr<webrtc::PeerConnectionInterface> peer_connection_;
116 rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface> 115 rtc::scoped_refptr<webrtc::PeerConnectionFactoryInterface>
117 peer_connection_factory_; 116 peer_connection_factory_;
118 rtc::scoped_refptr<FakeAudioCaptureModule> fake_audio_capture_module_; 117 rtc::scoped_refptr<FakeAudioCaptureModule> fake_audio_capture_module_;
119 rtc::scoped_ptr<webrtc::FakeVideoTrackRenderer> renderer_; 118 rtc::scoped_ptr<webrtc::FakeVideoTrackRenderer> renderer_;
120 }; 119 };
121 120
122 #endif // TALK_APP_WEBRTC_TEST_PEERCONNECTIONTESTWRAPPER_H_ 121 #endif // TALK_APP_WEBRTC_TEST_PEERCONNECTIONTESTWRAPPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698