| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this | 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this |
| 2 // source code is governed by a BSD-style license that can be found in the | 2 // source code is governed by a BSD-style license that can be found in the |
| 3 // LICENSE file. | 3 // LICENSE file. |
| 4 | 4 |
| 5 #include "media/player/movie.h" | 5 #include "media/tools/player_wtl/movie.h" |
| 6 | 6 |
| 7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
| 8 #include "media/base/pipeline_impl.h" | 8 #include "media/base/pipeline_impl.h" |
| 9 #include "media/filters/audio_renderer_impl.h" | 9 #include "media/filters/audio_renderer_impl.h" |
| 10 #include "media/filters/ffmpeg_audio_decoder.h" | 10 #include "media/filters/ffmpeg_audio_decoder.h" |
| 11 #include "media/filters/ffmpeg_demuxer.h" | 11 #include "media/filters/ffmpeg_demuxer.h" |
| 12 #include "media/filters/ffmpeg_video_decoder.h" | 12 #include "media/filters/ffmpeg_video_decoder.h" |
| 13 #include "media/filters/file_data_source.h" | 13 #include "media/filters/file_data_source.h" |
| 14 #include "media/filters/null_audio_renderer.h" | 14 #include "media/filters/null_audio_renderer.h" |
| 15 #include "media/player/wtl_renderer.h" | 15 #include "media/player/wtl_renderer.h" |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 void Movie::Close() { | 163 void Movie::Close() { |
| 164 if (pipeline_) { | 164 if (pipeline_) { |
| 165 pipeline_->Stop(NULL); | 165 pipeline_->Stop(NULL); |
| 166 thread_->Stop(); | 166 thread_->Stop(); |
| 167 pipeline_ = NULL; | 167 pipeline_ = NULL; |
| 168 thread_.reset(); | 168 thread_.reset(); |
| 169 } | 169 } |
| 170 } | 170 } |
| 171 | 171 |
| 172 } // namespace media | 172 } // namespace media |
| OLD | NEW |