| 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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 {} | 78 void OnAudibleStateChanged(int player_id, bool is_audible_now) override {} |
| 79 void OnWaitingForDecryptionKey(int player_id) override {} | 79 void OnWaitingForDecryptionKey(int player_id) override {} |
| 80 MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; } | 80 MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; } |
| 81 MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; } | 81 MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; } |
| 82 void RequestFullScreen(int player_id) override {} | 82 void RequestFullScreen(int player_id) override {} |
| 83 #if defined(VIDEO_HOLE) | |
| 84 bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() override { | |
| 85 return false; | |
| 86 } | |
| 87 #endif // defined(VIDEO_HOLE) | |
| 88 | 83 |
| 89 bool playback_completed() const { | 84 bool playback_completed() const { |
| 90 return playback_completed_; | 85 return playback_completed_; |
| 91 } | 86 } |
| 92 | 87 |
| 93 int num_resources_requested() const { | 88 int num_resources_requested() const { |
| 94 return num_resources_requested_; | 89 return num_resources_requested_; |
| 95 } | 90 } |
| 96 | 91 |
| 97 int num_metadata_changes() const { | 92 int num_metadata_changes() const { |
| (...skipping 2257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2355 // Wait for the metadata change. | 2350 // Wait for the metadata change. |
| 2356 while(manager_.num_metadata_changes() == 1) { | 2351 while(manager_.num_metadata_changes() == 1) { |
| 2357 player_.OnDemuxerDataAvailable(data); | 2352 player_.OnDemuxerDataAvailable(data); |
| 2358 WaitForVideoDecodeDone(); | 2353 WaitForVideoDecodeDone(); |
| 2359 } | 2354 } |
| 2360 EXPECT_EQ(2, manager_.num_metadata_changes()); | 2355 EXPECT_EQ(2, manager_.num_metadata_changes()); |
| 2361 WaitForVideoDecodeDone(); | 2356 WaitForVideoDecodeDone(); |
| 2362 } | 2357 } |
| 2363 | 2358 |
| 2364 } // namespace media | 2359 } // namespace media |
| OLD | NEW |