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 "net/base/mime_util.h" | 10 #include "net/base/mime_util.h" |
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
330 void WebMediaPlayerAndroid::OnVideoSizeChanged(int width, int height) { | 330 void WebMediaPlayerAndroid::OnVideoSizeChanged(int width, int height) { |
331 if (natural_size_.width == width && natural_size_.height == height) | 331 if (natural_size_.width == width && natural_size_.height == height) |
332 return; | 332 return; |
333 | 333 |
334 natural_size_.width = width; | 334 natural_size_.width = width; |
335 natural_size_.height = height; | 335 natural_size_.height = height; |
336 if (texture_id_) { | 336 if (texture_id_) { |
337 video_frame_.reset(new WebVideoFrameImpl(VideoFrame::WrapNativeTexture( | 337 video_frame_.reset(new WebVideoFrameImpl(VideoFrame::WrapNativeTexture( |
338 texture_id_, kGLTextureExternalOES, natural_size_, natural_size_, | 338 texture_id_, kGLTextureExternalOES, natural_size_, natural_size_, |
339 base::TimeDelta(), | 339 base::TimeDelta(), |
| 340 VideoFrame::ReadPixelsCB(), |
340 base::Closure()))); | 341 base::Closure()))); |
341 } | 342 } |
342 } | 343 } |
343 | 344 |
344 void WebMediaPlayerAndroid::UpdateNetworkState( | 345 void WebMediaPlayerAndroid::UpdateNetworkState( |
345 WebMediaPlayer::NetworkState state) { | 346 WebMediaPlayer::NetworkState state) { |
346 network_state_ = state; | 347 network_state_ = state; |
347 client_->networkStateChanged(); | 348 client_->networkStateChanged(); |
348 } | 349 } |
349 | 350 |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 if (stream_texture_factory_.get() && stream_id_) | 408 if (stream_texture_factory_.get() && stream_id_) |
408 stream_texture_factory_->EstablishPeer(stream_id_, player_id_); | 409 stream_texture_factory_->EstablishPeer(stream_id_, player_id_); |
409 needs_establish_peer_ = false; | 410 needs_establish_peer_ = false; |
410 } | 411 } |
411 | 412 |
412 void WebMediaPlayerAndroid::UpdatePlayingState(bool is_playing) { | 413 void WebMediaPlayerAndroid::UpdatePlayingState(bool is_playing) { |
413 is_playing_ = is_playing; | 414 is_playing_ = is_playing; |
414 } | 415 } |
415 | 416 |
416 } // namespace webkit_media | 417 } // namespace webkit_media |
OLD | NEW |