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

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

Issue 315733003: Separate BrowserCdmManager from BrowserMediaPlayerManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor fix after rebase Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « media/base/android/media_player_manager.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 virtual void OnMediaInterrupted(int player_id) OVERRIDE {} 67 virtual void OnMediaInterrupted(int player_id) OVERRIDE {}
68 virtual void OnBufferingUpdate(int player_id, int percentage) OVERRIDE {} 68 virtual void OnBufferingUpdate(int player_id, int percentage) OVERRIDE {}
69 virtual void OnSeekComplete(int player_id, 69 virtual void OnSeekComplete(int player_id,
70 const base::TimeDelta& current_time) OVERRIDE {} 70 const base::TimeDelta& current_time) OVERRIDE {}
71 virtual void OnError(int player_id, int error) OVERRIDE {} 71 virtual void OnError(int player_id, int error) OVERRIDE {}
72 virtual void OnVideoSizeChanged(int player_id, int width, 72 virtual void OnVideoSizeChanged(int player_id, int width,
73 int height) OVERRIDE {} 73 int height) OVERRIDE {}
74 virtual MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE { return NULL; } 74 virtual MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE { return NULL; }
75 virtual MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE { return NULL; } 75 virtual MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE { return NULL; }
76 virtual void DestroyAllMediaPlayers() OVERRIDE {} 76 virtual void DestroyAllMediaPlayers() OVERRIDE {}
77 virtual BrowserCdm* GetCdm(int cdm_id) OVERRIDE { return NULL; }
78 virtual void RequestFullScreen(int player_id) OVERRIDE {} 77 virtual void RequestFullScreen(int player_id) OVERRIDE {}
79 virtual void OnSessionCreated(int cdm_id,
80 uint32 session_id,
81 const std::string& web_session_id) OVERRIDE {}
82 virtual void OnSessionMessage(int cdm_id,
83 uint32 session_id,
84 const std::vector<uint8>& message,
85 const GURL& destination_url) OVERRIDE {}
86 virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE {}
87 virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE {}
88 virtual void OnSessionError(int cdm_id,
89 uint32 session_id,
90 MediaKeys::KeyError error_code,
91 uint32 system_code) OVERRIDE {}
92 78
93 bool playback_completed() const { 79 bool playback_completed() const {
94 return playback_completed_; 80 return playback_completed_;
95 } 81 }
96 82
97 int num_resources_requested() const { 83 int num_resources_requested() const {
98 return num_resources_requested_; 84 return num_resources_requested_;
99 } 85 }
100 86
101 int num_resources_released() const { 87 int num_resources_released() const {
(...skipping 2027 matching lines...) Expand 10 before | Expand all | Expand 10 after
2129 2115
2130 DemuxerConfigs configs = CreateAudioDemuxerConfigs(kCodecVorbis, true); 2116 DemuxerConfigs configs = CreateAudioDemuxerConfigs(kCodecVorbis, true);
2131 DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged( 2117 DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged(
2132 true, 0, configs); 2118 true, 0, configs);
2133 player_.OnDemuxerDataAvailable(data); 2119 player_.OnDemuxerDataAvailable(data);
2134 WaitForAudioDecodeDone(); 2120 WaitForAudioDecodeDone();
2135 DecodeAudioDataUntilOutputBecomesAvailable(); 2121 DecodeAudioDataUntilOutputBecomesAvailable();
2136 } 2122 }
2137 2123
2138 } // namespace media 2124 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_player_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698