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

Side by Side Diff: talk/app/webrtc/test/fakeaudiocapturemodule.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: Fixing potential deadlock in FakeAudioCaptureModule, caused by unnecessary call to Thread::Send 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 2012 Google Inc. 3 * Copyright 2012 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 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 232
233 // Starts the periodic calling of ProcessFrame() in a thread safe way. 233 // Starts the periodic calling of ProcessFrame() in a thread safe way.
234 void StartProcessP(); 234 void StartProcessP();
235 // Periodcally called function that ensures that frames are pulled and pushed 235 // Periodcally called function that ensures that frames are pulled and pushed
236 // periodically if enabled/started. 236 // periodically if enabled/started.
237 void ProcessFrameP(); 237 void ProcessFrameP();
238 // Pulls frames from the registered webrtc::AudioTransport. 238 // Pulls frames from the registered webrtc::AudioTransport.
239 void ReceiveFrameP(); 239 void ReceiveFrameP();
240 // Pushes frames to the registered webrtc::AudioTransport. 240 // Pushes frames to the registered webrtc::AudioTransport.
241 void SendFrameP(); 241 void SendFrameP();
242 // Stops the periodic calling of ProcessFrame() in a thread safe way.
243 void StopProcessP();
244 242
245 // The time in milliseconds when Process() was last called or 0 if no call 243 // The time in milliseconds when Process() was last called or 0 if no call
246 // has been made. 244 // has been made.
247 uint32 last_process_time_ms_; 245 uint32 last_process_time_ms_;
248 246
249 // Callback for playout and recording. 247 // Callback for playout and recording.
250 webrtc::AudioTransport* audio_callback_; 248 webrtc::AudioTransport* audio_callback_;
251 249
252 bool recording_; // True when audio is being pushed from the instance. 250 bool recording_; // True when audio is being pushed from the instance.
253 bool playing_; // True when audio is being pulled by the instance. 251 bool playing_; // True when audio is being pulled by the instance.
(...skipping 27 matching lines...) Expand all
281 279
282 // Protects variables that are accessed from process_thread_ and 280 // Protects variables that are accessed from process_thread_ and
283 // the main thread. 281 // the main thread.
284 mutable rtc::CriticalSection crit_; 282 mutable rtc::CriticalSection crit_;
285 // Protects |audio_callback_| that is accessed from process_thread_ and 283 // Protects |audio_callback_| that is accessed from process_thread_ and
286 // the main thread. 284 // the main thread.
287 rtc::CriticalSection crit_callback_; 285 rtc::CriticalSection crit_callback_;
288 }; 286 };
289 287
290 #endif // TALK_APP_WEBRTC_TEST_FAKEAUDIOCAPTUREMODULE_H_ 288 #endif // TALK_APP_WEBRTC_TEST_FAKEAUDIOCAPTUREMODULE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698