Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(309)

Side by Side Diff: media/base/android/media_source_player_unittest.cc

Issue 975943003: Revert of Revert of Propagate audible state from player to the containing tab" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 {}
78 MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; } 79 MediaPlayerAndroid* GetFullscreenPlayer() override { return NULL; }
79 MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; } 80 MediaPlayerAndroid* GetPlayer(int player_id) override { return NULL; }
80 void RequestFullScreen(int player_id) override {} 81 void RequestFullScreen(int player_id) override {}
81 #if defined(VIDEO_HOLE) 82 #if defined(VIDEO_HOLE)
82 bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() override { 83 bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() override {
83 return false; 84 return false;
84 } 85 }
85 #endif // defined(VIDEO_HOLE) 86 #endif // defined(VIDEO_HOLE)
86 87
87 bool playback_completed() const { 88 bool playback_completed() const {
(...skipping 2265 matching lines...) Expand 10 before | Expand all | Expand 10 after
2353 // Wait for the metadata change. 2354 // Wait for the metadata change.
2354 while(manager_.num_metadata_changes() == 1) { 2355 while(manager_.num_metadata_changes() == 1) {
2355 player_.OnDemuxerDataAvailable(data); 2356 player_.OnDemuxerDataAvailable(data);
2356 WaitForVideoDecodeDone(); 2357 WaitForVideoDecodeDone();
2357 } 2358 }
2358 EXPECT_EQ(2, manager_.num_metadata_changes()); 2359 EXPECT_EQ(2, manager_.num_metadata_changes());
2359 WaitForVideoDecodeDone(); 2360 WaitForVideoDecodeDone();
2360 } 2361 }
2361 2362
2362 } // namespace media 2363 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698