| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "webkit/glue/webmediaplayer_impl.h" | 5 #include "webkit/glue/webmediaplayer_impl.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "media/base/composite_data_source_factory.h" | 12 #include "media/base/composite_data_source_factory.h" |
| 13 #include "media/base/filter_collection.h" | 13 #include "media/base/filter_collection.h" |
| 14 #include "media/base/limits.h" | 14 #include "media/base/limits.h" |
| 15 #include "media/base/media_format.h" | |
| 16 #include "media/base/media_switches.h" | 15 #include "media/base/media_switches.h" |
| 17 #include "media/base/pipeline_impl.h" | 16 #include "media/base/pipeline_impl.h" |
| 18 #include "media/base/video_frame.h" | 17 #include "media/base/video_frame.h" |
| 19 #include "media/filters/adaptive_demuxer.h" | 18 #include "media/filters/adaptive_demuxer.h" |
| 20 #include "media/filters/ffmpeg_audio_decoder.h" | 19 #include "media/filters/ffmpeg_audio_decoder.h" |
| 21 #include "media/filters/ffmpeg_demuxer_factory.h" | 20 #include "media/filters/ffmpeg_demuxer_factory.h" |
| 22 #include "media/filters/ffmpeg_video_decoder.h" | 21 #include "media/filters/ffmpeg_video_decoder.h" |
| 23 #include "media/filters/null_audio_renderer.h" | 22 #include "media/filters/null_audio_renderer.h" |
| 24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" | 23 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" |
| 25 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" | 24 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" |
| (...skipping 914 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 940 } | 939 } |
| 941 } | 940 } |
| 942 | 941 |
| 943 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { | 942 WebKit::WebMediaPlayerClient* WebMediaPlayerImpl::GetClient() { |
| 944 DCHECK(MessageLoop::current() == main_loop_); | 943 DCHECK(MessageLoop::current() == main_loop_); |
| 945 DCHECK(client_); | 944 DCHECK(client_); |
| 946 return client_; | 945 return client_; |
| 947 } | 946 } |
| 948 | 947 |
| 949 } // namespace webkit_glue | 948 } // namespace webkit_glue |
| OLD | NEW |