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

Side by Side Diff: chrome/renderer/media/audio_renderer_impl.h

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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 | « chrome/plugin/plugin_channel.cc ('k') | chrome/renderer/media/audio_renderer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // Audio rendering unit utilizing audio output stream provided by browser 5 // Audio rendering unit utilizing audio output stream provided by browser
6 // process through IPC. 6 // process through IPC.
7 // 7 //
8 // Relationship of classes. 8 // Relationship of classes.
9 // 9 //
10 // AudioRendererHost AudioRendererImpl 10 // AudioRendererHost AudioRendererImpl
(...skipping 23 matching lines...) Expand all
34 // 3. Audio decoder thread (If there's one.) 34 // 3. Audio decoder thread (If there's one.)
35 // Responsible for decoding audio data and gives raw PCM data to this object. 35 // Responsible for decoding audio data and gives raw PCM data to this object.
36 36
37 #ifndef CHROME_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_ 37 #ifndef CHROME_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_
38 #define CHROME_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_ 38 #define CHROME_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_
39 #pragma once 39 #pragma once
40 40
41 #include "base/gtest_prod_util.h" 41 #include "base/gtest_prod_util.h"
42 #include "base/message_loop.h" 42 #include "base/message_loop.h"
43 #include "base/scoped_ptr.h" 43 #include "base/scoped_ptr.h"
44 #include "base/lock.h"
45 #include "base/shared_memory.h" 44 #include "base/shared_memory.h"
45 #include "base/synchronization/lock.h"
46 #include "chrome/renderer/audio_message_filter.h" 46 #include "chrome/renderer/audio_message_filter.h"
47 #include "media/audio/audio_io.h" 47 #include "media/audio/audio_io.h"
48 #include "media/audio/audio_manager.h" 48 #include "media/audio/audio_manager.h"
49 #include "media/base/filters.h" 49 #include "media/base/filters.h"
50 #include "media/filters/audio_renderer_base.h" 50 #include "media/filters/audio_renderer_base.h"
51 51
52 class AudioMessageFilter; 52 class AudioMessageFilter;
53 53
54 class AudioRendererImpl : public media::AudioRendererBase, 54 class AudioRendererImpl : public media::AudioRendererBase,
55 public AudioMessageFilter::Delegate, 55 public AudioMessageFilter::Delegate,
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 scoped_ptr<base::SharedMemory> shared_memory_; 127 scoped_ptr<base::SharedMemory> shared_memory_;
128 uint32 shared_memory_size_; 128 uint32 shared_memory_size_;
129 129
130 // Message loop for the IO thread. 130 // Message loop for the IO thread.
131 MessageLoop* io_loop_; 131 MessageLoop* io_loop_;
132 132
133 // Protects: 133 // Protects:
134 // - |stopped_| 134 // - |stopped_|
135 // - |pending_request_| 135 // - |pending_request_|
136 // - |request_buffers_state_| 136 // - |request_buffers_state_|
137 Lock lock_; 137 base::Lock lock_;
138 138
139 // A flag that indicates this filter is called to stop. 139 // A flag that indicates this filter is called to stop.
140 bool stopped_; 140 bool stopped_;
141 141
142 // A flag that indicates an outstanding packet request. 142 // A flag that indicates an outstanding packet request.
143 bool pending_request_; 143 bool pending_request_;
144 144
145 // State of the audio buffers at time of the last request. 145 // State of the audio buffers at time of the last request.
146 AudioBuffersState request_buffers_state_; 146 AudioBuffersState request_buffers_state_;
147 147
148 // State variables for prerolling. 148 // State variables for prerolling.
149 bool prerolling_; 149 bool prerolling_;
150 150
151 // Remaining bytes for prerolling to complete. 151 // Remaining bytes for prerolling to complete.
152 uint32 preroll_bytes_; 152 uint32 preroll_bytes_;
153 153
154 DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl); 154 DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
155 }; 155 };
156 156
157 #endif // CHROME_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_ 157 #endif // CHROME_RENDERER_MEDIA_AUDIO_RENDERER_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/plugin/plugin_channel.cc ('k') | chrome/renderer/media/audio_renderer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698