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

Side by Side Diff: media/audio/audio_output_controller.cc

Issue 10837350: Revert 152406 - Introduce shared_memory_support media target for PPAPI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « media/audio/audio_output_controller.h ('k') | media/audio/audio_output_device.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Added: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/audio/audio_output_controller.h" 5 #include "media/audio/audio_output_controller.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "base/synchronization/waitable_event.h" 10 #include "base/synchronization/waitable_event.h"
11 #include "base/threading/platform_thread.h" 11 #include "base/threading/platform_thread.h"
12 #include "base/threading/thread_restrictions.h" 12 #include "base/threading/thread_restrictions.h"
13 #include "base/time.h" 13 #include "base/time.h"
14 #include "media/audio/shared_memory_util.h"
15 14
16 using base::Time; 15 using base::Time;
17 using base::TimeDelta; 16 using base::TimeDelta;
18 using base::WaitableEvent; 17 using base::WaitableEvent;
19 18
20 namespace media { 19 namespace media {
21 20
21 // Signal a pause in low-latency mode.
22 const int AudioOutputController::kPauseMark = -1;
23
22 // Polling-related constants. 24 // Polling-related constants.
23 const int AudioOutputController::kPollNumAttempts = 3; 25 const int AudioOutputController::kPollNumAttempts = 3;
24 const int AudioOutputController::kPollPauseInMilliseconds = 3; 26 const int AudioOutputController::kPollPauseInMilliseconds = 3;
25 27
26 AudioOutputController::AudioOutputController(EventHandler* handler, 28 AudioOutputController::AudioOutputController(EventHandler* handler,
27 SyncReader* sync_reader) 29 SyncReader* sync_reader)
28 : handler_(handler), 30 : handler_(handler),
29 stream_(NULL), 31 stream_(NULL),
30 volume_(1.0), 32 volume_(1.0),
31 state_(kEmpty), 33 state_(kEmpty),
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 stream_ = NULL; 332 stream_ = NULL;
331 weak_this_.InvalidateWeakPtrs(); 333 weak_this_.InvalidateWeakPtrs();
332 } 334 }
333 335
334 // Should be last in the method, do not touch "this" from here on. 336 // Should be last in the method, do not touch "this" from here on.
335 if (done != NULL) 337 if (done != NULL)
336 done->Signal(); 338 done->Signal();
337 } 339 }
338 340
339 } // namespace media 341 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/audio_output_controller.h ('k') | media/audio/audio_output_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698