OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/media/android/webmediaplayer_android.h" | 5 #include "webkit/media/android/webmediaplayer_android.h" |
6 | 6 |
7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "media/base/android/media_player_bridge.h" | 9 #include "media/base/android/media_player_bridge.h" |
| 10 #include "media/base/video_frame.h" |
10 #include "net/base/mime_util.h" | 11 #include "net/base/mime_util.h" |
11 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.
h" | 12 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.
h" |
12 #include "webkit/media/android/stream_texture_factory_android.h" | 13 #include "webkit/media/android/stream_texture_factory_android.h" |
13 #include "webkit/media/android/webmediaplayer_manager_android.h" | 14 #include "webkit/media/android/webmediaplayer_manager_android.h" |
14 #include "webkit/media/webmediaplayer_util.h" | 15 #include "webkit/media/webmediaplayer_util.h" |
15 #include "webkit/media/webvideoframe_impl.h" | 16 #include "webkit/media/webvideoframe_impl.h" |
16 | 17 |
17 static const uint32 kGLTextureExternalOES = 0x8D65; | 18 static const uint32 kGLTextureExternalOES = 0x8D65; |
18 | 19 |
19 using WebKit::WebMediaPlayer; | 20 using WebKit::WebMediaPlayer; |
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
413 | 414 |
414 void WebMediaPlayerAndroid::SetNeedsEstablishPeer(bool needs_establish_peer) { | 415 void WebMediaPlayerAndroid::SetNeedsEstablishPeer(bool needs_establish_peer) { |
415 needs_establish_peer_ = needs_establish_peer; | 416 needs_establish_peer_ = needs_establish_peer; |
416 } | 417 } |
417 | 418 |
418 void WebMediaPlayerAndroid::UpdatePlayingState(bool is_playing) { | 419 void WebMediaPlayerAndroid::UpdatePlayingState(bool is_playing) { |
419 is_playing_ = is_playing; | 420 is_playing_ = is_playing; |
420 } | 421 } |
421 | 422 |
422 } // namespace webkit_media | 423 } // namespace webkit_media |
OLD | NEW |