| 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 } | 74 } |
| 75 void OnMediaInterrupted(int player_id) override {} | 75 void OnMediaInterrupted(int player_id) override {} |
| 76 void OnBufferingUpdate(int player_id, int percentage) override {} | 76 void OnBufferingUpdate(int player_id, int percentage) override {} |
| 77 void OnSeekComplete(int player_id, | 77 void OnSeekComplete(int player_id, |
| 78 const base::TimeDelta& current_time) override {} | 78 const base::TimeDelta& current_time) override {} |
| 79 void OnError(int player_id, int error) override {} | 79 void OnError(int player_id, int error) override {} |
| 80 void OnVideoSizeChanged(int player_id, int width, int height) override {} | 80 void OnVideoSizeChanged(int player_id, int width, int height) override {} |
| 81 void OnWaitingForDecryptionKey(int player_id) override {} | 81 void OnWaitingForDecryptionKey(int player_id) override {} |
| 82 MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; } | 82 MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; } |
| 83 MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; } | 83 MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; } |
| 84 void RequestFullScreen(int player_id) override {} | |
| 85 | 84 |
| 86 bool RequestPlay(int player_id) override { | 85 bool RequestPlay(int player_id) override { |
| 87 return allow_play_; | 86 return allow_play_; |
| 88 } | 87 } |
| 89 | 88 |
| 90 void OnAudibleStateChanged(int player_id, bool is_audible_now) override { | 89 void OnAudibleStateChanged(int player_id, bool is_audible_now) override { |
| 91 is_audible_ = is_audible_now; | 90 is_audible_ = is_audible_now; |
| 92 } | 91 } |
| 93 | 92 |
| 94 bool playback_completed() const { | 93 bool playback_completed() const { |
| (...skipping 2467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2562 | 2561 |
| 2563 EXPECT_EQ(demuxer_->num_data_requests(), 0); | 2562 EXPECT_EQ(demuxer_->num_data_requests(), 0); |
| 2564 player_.OnDemuxerConfigsAvailable(CreateDemuxerConfigs(true, true)); | 2563 player_.OnDemuxerConfigsAvailable(CreateDemuxerConfigs(true, true)); |
| 2565 | 2564 |
| 2566 manager_.set_allow_play(true); | 2565 manager_.set_allow_play(true); |
| 2567 player_.Start(); | 2566 player_.Start(); |
| 2568 EXPECT_TRUE(player_.IsPlaying()); | 2567 EXPECT_TRUE(player_.IsPlaying()); |
| 2569 } | 2568 } |
| 2570 | 2569 |
| 2571 } // namespace media | 2570 } // namespace media |
| OLD | NEW |