| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 playback_completed_ = true; | 68 playback_completed_ = true; |
| 69 if (message_loop_->is_running()) | 69 if (message_loop_->is_running()) |
| 70 message_loop_->Quit(); | 70 message_loop_->Quit(); |
| 71 } | 71 } |
| 72 void OnMediaInterrupted(int player_id) override {} | 72 void OnMediaInterrupted(int player_id) override {} |
| 73 void OnBufferingUpdate(int player_id, int percentage) override {} | 73 void OnBufferingUpdate(int player_id, int percentage) override {} |
| 74 void OnSeekComplete(int player_id, | 74 void OnSeekComplete(int player_id, |
| 75 const base::TimeDelta& current_time) override {} | 75 const base::TimeDelta& current_time) override {} |
| 76 void OnError(int player_id, int error) override {} | 76 void OnError(int player_id, int error) override {} |
| 77 void OnVideoSizeChanged(int player_id, int width, int height) override {} | 77 void OnVideoSizeChanged(int player_id, int width, int height) override {} |
| 78 void OnAudibleStateChanged(int player_id, bool is_audible_now) override {} | |
| 79 MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; } | 78 MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; } |
| 80 MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; } | 79 MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; } |
| 81 void RequestFullScreen(int player_id) override {} | 80 void RequestFullScreen(int player_id) override {} |
| 82 #if defined(VIDEO_HOLE) | 81 #if defined(VIDEO_HOLE) |
| 83 bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() override { | 82 bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() override { |
| 84 return false; | 83 return false; |
| 85 } | 84 } |
| 86 #endif // defined(VIDEO_HOLE) | 85 #endif // defined(VIDEO_HOLE) |
| 87 | 86 |
| 88 bool playback_completed() const { | 87 bool playback_completed() const { |
| (...skipping 2265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2354 // Wait for the metadata change. | 2353 // Wait for the metadata change. |
| 2355 while(manager_.num_metadata_changes() == 1) { | 2354 while(manager_.num_metadata_changes() == 1) { |
| 2356 player_.OnDemuxerDataAvailable(data); | 2355 player_.OnDemuxerDataAvailable(data); |
| 2357 WaitForVideoDecodeDone(); | 2356 WaitForVideoDecodeDone(); |
| 2358 } | 2357 } |
| 2359 EXPECT_EQ(2, manager_.num_metadata_changes()); | 2358 EXPECT_EQ(2, manager_.num_metadata_changes()); |
| 2360 WaitForVideoDecodeDone(); | 2359 WaitForVideoDecodeDone(); |
| 2361 } | 2360 } |
| 2362 | 2361 |
| 2363 } // namespace media | 2362 } // namespace media |
| OLD | NEW |