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

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

Issue 378543002: Skip to enter the fullscreen automatically when hole-punching is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: guarded by VIDEO_HOLE. Created 6 years, 5 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_source_player.cc ('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 RequestFullScreen(int player_id) OVERRIDE {} 76 virtual void RequestFullScreen(int player_id) OVERRIDE {}
77 #if defined(VIDEO_HOLE)
78 virtual bool ShouldUseVideoOverlayForEmbeddedEncryptedVideo() OVERRIDE {
79 return false;
80 }
81 #endif // defined(VIDEO_HOLE)
77 82
78 bool playback_completed() const { 83 bool playback_completed() const {
79 return playback_completed_; 84 return playback_completed_;
80 } 85 }
81 86
82 int num_resources_requested() const { 87 int num_resources_requested() const {
83 return num_resources_requested_; 88 return num_resources_requested_;
84 } 89 }
85 90
86 int num_resources_released() const { 91 int num_resources_released() const {
(...skipping 2103 matching lines...) Expand 10 before | Expand all | Expand 10 after
2190 2195
2191 DemuxerConfigs configs = CreateAudioDemuxerConfigs(kCodecVorbis, true); 2196 DemuxerConfigs configs = CreateAudioDemuxerConfigs(kCodecVorbis, true);
2192 DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged( 2197 DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged(
2193 true, 0, configs); 2198 true, 0, configs);
2194 player_.OnDemuxerDataAvailable(data); 2199 player_.OnDemuxerDataAvailable(data);
2195 WaitForAudioDecodeDone(); 2200 WaitForAudioDecodeDone();
2196 DecodeAudioDataUntilOutputBecomesAvailable(); 2201 DecodeAudioDataUntilOutputBecomesAvailable();
2197 } 2202 }
2198 2203
2199 } // namespace media 2204 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_source_player.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698