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

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

Issue 1215713021: Reverted the code for the non-interactive audible tab notification (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@notification
Patch Set: Fixed indent Created 5 years, 3 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
« no previous file with comments | « media/base/android/audio_decoder_job.h ('k') | media/base/android/media_decoder_job.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 #include "base/timer/timer.h" 7 #include "base/timer/timer.h"
8 #include "media/base/android/demuxer_android.h" 8 #include "media/base/android/demuxer_android.h"
9 #include "media/base/android/media_codec_bridge.h" 9 #include "media/base/android/media_codec_bridge.h"
10 #include "media/base/android/media_codec_player.h" 10 #include "media/base/android/media_codec_player.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 } 92 }
93 93
94 void OnMediaInterrupted(int player_id) override {} 94 void OnMediaInterrupted(int player_id) override {}
95 void OnBufferingUpdate(int player_id, int percentage) override {} 95 void OnBufferingUpdate(int player_id, int percentage) override {}
96 void OnSeekComplete(int player_id, 96 void OnSeekComplete(int player_id,
97 const base::TimeDelta& current_time) override { 97 const base::TimeDelta& current_time) override {
98 ++num_seeks_completed_; 98 ++num_seeks_completed_;
99 } 99 }
100 void OnError(int player_id, int error) override {} 100 void OnError(int player_id, int error) override {}
101 void OnVideoSizeChanged(int player_id, int width, int height) override {} 101 void OnVideoSizeChanged(int player_id, int width, int height) override {}
102 void OnAudibleStateChanged(int player_id, bool is_audible_now) override {}
103 void OnWaitingForDecryptionKey(int player_id) override {} 102 void OnWaitingForDecryptionKey(int player_id) override {}
104 MediaPlayerAndroid* GetFullscreenPlayer() override { return nullptr; } 103 MediaPlayerAndroid* GetFullscreenPlayer() override { return nullptr; }
105 MediaPlayerAndroid* GetPlayer(int player_id) override { return nullptr; } 104 MediaPlayerAndroid* GetPlayer(int player_id) override { return nullptr; }
106 bool RequestPlay(int player_id) override { return true; } 105 bool RequestPlay(int player_id) override { return true; }
107 106
108 void OnMediaResourcesRequested(int player_id) {} 107 void OnMediaResourcesRequested(int player_id) {}
109 108
110 // Time update callback that reports the internal progress of the stream. 109 // Time update callback that reports the internal progress of the stream.
111 // Implementation dependent, used for testing only. 110 // Implementation dependent, used for testing only.
112 void OnDecodersTimeUpdate(DemuxerStream::Type stream_type, 111 void OnDecodersTimeUpdate(DemuxerStream::Type stream_type,
(...skipping 1469 matching lines...) Expand 10 before | Expand all | Expand 10 after
1582 // Play till completion. 1581 // Play till completion.
1583 EXPECT_TRUE( 1582 EXPECT_TRUE(
1584 WaitForCondition(base::Bind(&MockMediaPlayerManager::IsPlaybackCompleted, 1583 WaitForCondition(base::Bind(&MockMediaPlayerManager::IsPlaybackCompleted,
1585 base::Unretained(&manager_)))); 1584 base::Unretained(&manager_))));
1586 1585
1587 // There should not be any video frames. 1586 // There should not be any video frames.
1588 EXPECT_FALSE(manager_.HasFirstFrame(DemuxerStream::VIDEO)); 1587 EXPECT_FALSE(manager_.HasFirstFrame(DemuxerStream::VIDEO));
1589 } 1588 }
1590 1589
1591 } // namespace media 1590 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/audio_decoder_job.h ('k') | media/base/android/media_decoder_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698