diff options
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/pipeline_impl.cc | 2 | ||||
| -rw-r--r-- | media/filters/video_renderer_base.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc index 3b27943..d295d6b 100644 --- a/media/base/pipeline_impl.cc +++ b/media/base/pipeline_impl.cc @@ -7,8 +7,8 @@ #include "base/callback.h" #include "base/compiler_specific.h" -#include "base/condition_variable.h" #include "base/stl_util-inl.h" +#include "base/synchronization/condition_variable.h" #include "media/base/clock_impl.h" #include "media/base/filter_collection.h" #include "media/base/media_format.h" diff --git a/media/filters/video_renderer_base.h b/media/filters/video_renderer_base.h index 8868521..1e1c4fe 100644 --- a/media/filters/video_renderer_base.h +++ b/media/filters/video_renderer_base.h @@ -17,9 +17,9 @@ #include <deque> -#include "base/condition_variable.h" -#include "base/lock.h" #include "base/scoped_ptr.h" +#include "base/synchronization/condition_variable.h" +#include "base/synchronization/lock.h" #include "base/threading/platform_thread.h" #include "media/base/filters.h" #include "media/base/video_frame.h" @@ -129,7 +129,7 @@ class VideoRendererBase : public VideoRenderer, float playback_rate); // Used for accessing data members. - Lock lock_; + base::Lock lock_; scoped_refptr<VideoDecoder> decoder_; @@ -148,7 +148,7 @@ class VideoRendererBase : public VideoRenderer, // Used to signal |thread_| as frames are added to |frames_|. Rule of thumb: // always check |state_| to see if it was set to STOPPED after waking up! - ConditionVariable frame_available_; + base::ConditionVariable frame_available_; // State transition Diagram of this class: // [kUninitialized] -------> [kError] |