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

Side by Side Diff: chromecast/media/cma/pipeline/av_pipeline_impl.h

Issue 974623002: Chromecast: mitigate threading issue between AvPipeline/MediaKeys. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef CHROMECAST_MEDIA_CMA_BASE_AV_PIPELINE_IMPL_H_ 5 #ifndef CHROMECAST_MEDIA_CMA_BASE_AV_PIPELINE_IMPL_H_
6 #define CHROMECAST_MEDIA_CMA_BASE_AV_PIPELINE_IMPL_H_ 6 #define CHROMECAST_MEDIA_CMA_BASE_AV_PIPELINE_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/synchronization/lock.h"
14 #include "base/threading/thread_checker.h" 15 #include "base/threading/thread_checker.h"
15 #include "chromecast/media/cma/backend/media_component_device.h" 16 #include "chromecast/media/cma/backend/media_component_device.h"
16 #include "chromecast/media/cma/pipeline/av_pipeline_client.h" 17 #include "chromecast/media/cma/pipeline/av_pipeline_client.h"
17 18
18 namespace media { 19 namespace media {
19 class AudioDecoderConfig; 20 class AudioDecoderConfig;
20 class VideoDecoderConfig; 21 class VideoDecoderConfig;
21 } 22 }
22 23
23 namespace chromecast { 24 namespace chromecast {
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 151
151 // Indicate if there is a frame being pushed to the audio device. 152 // Indicate if there is a frame being pushed to the audio device.
152 bool pending_push_; 153 bool pending_push_;
153 154
154 // The media time is retrieved at regular intervals. 155 // The media time is retrieved at regular intervals.
155 // Indicate whether time update is enabled. 156 // Indicate whether time update is enabled.
156 bool enable_time_update_; 157 bool enable_time_update_;
157 bool pending_time_update_task_; 158 bool pending_time_update_task_;
158 159
159 // Decryption keys, if available. 160 // Decryption keys, if available.
161 base::Lock media_keys_lock_;
160 BrowserCdmCast* media_keys_; 162 BrowserCdmCast* media_keys_;
161 int media_keys_callback_id_; 163 int media_keys_callback_id_;
162 164
163 base::WeakPtr<AvPipelineImpl> weak_this_; 165 base::WeakPtr<AvPipelineImpl> weak_this_;
164 base::WeakPtrFactory<AvPipelineImpl> weak_factory_; 166 base::WeakPtrFactory<AvPipelineImpl> weak_factory_;
165 167
166 DISALLOW_COPY_AND_ASSIGN(AvPipelineImpl); 168 DISALLOW_COPY_AND_ASSIGN(AvPipelineImpl);
167 }; 169 };
168 170
169 } // namespace media 171 } // namespace media
170 } // namespace chromecast 172 } // namespace chromecast
171 173
172 #endif // CHROMECAST_MEDIA_CMA_BASE_AV_PIPELINE_IMPL_H_ 174 #endif // CHROMECAST_MEDIA_CMA_BASE_AV_PIPELINE_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | chromecast/media/cma/pipeline/av_pipeline_impl.cc » ('j') | chromecast/media/cma/pipeline/av_pipeline_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698