| 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" |
| 11 #include "media/base/android/audio_decoder_job.h" | 11 #include "media/base/android/audio_decoder_job.h" |
| 12 #include "media/base/android/media_codec_bridge.h" | 12 #include "media/base/android/media_codec_bridge.h" |
| 13 #include "media/base/android/media_drm_bridge.h" | 13 #include "media/base/android/media_drm_bridge.h" |
| 14 #include "media/base/android/media_player_manager.h" | 14 #include "media/base/android/media_player_manager.h" |
| 15 #include "media/base/android/media_source_player.h" | 15 #include "media/base/android/media_source_player.h" |
| 16 #include "media/base/android/media_url_interceptor.h" |
| 16 #include "media/base/android/video_decoder_job.h" | 17 #include "media/base/android/video_decoder_job.h" |
| 17 #include "media/base/bind_to_current_loop.h" | 18 #include "media/base/bind_to_current_loop.h" |
| 18 #include "media/base/decoder_buffer.h" | 19 #include "media/base/decoder_buffer.h" |
| 19 #include "media/base/test_data_util.h" | 20 #include "media/base/test_data_util.h" |
| 20 #include "testing/gmock/include/gmock/gmock.h" | 21 #include "testing/gmock/include/gmock/gmock.h" |
| 21 #include "ui/gl/android/surface_texture.h" | 22 #include "ui/gl/android/surface_texture.h" |
| 22 | 23 |
| 23 namespace media { | 24 namespace media { |
| 24 | 25 |
| 25 // Helper macro to skip the test if MediaCodecBridge isn't available. | 26 // Helper macro to skip the test if MediaCodecBridge isn't available. |
| (...skipping 19 matching lines...) Expand all Loading... |
| 45 playback_completed_(false), | 46 playback_completed_(false), |
| 46 num_resources_requested_(0), | 47 num_resources_requested_(0), |
| 47 num_resources_released_(0), | 48 num_resources_released_(0), |
| 48 timestamp_updated_(false) {} | 49 timestamp_updated_(false) {} |
| 49 virtual ~MockMediaPlayerManager() {} | 50 virtual ~MockMediaPlayerManager() {} |
| 50 | 51 |
| 51 // MediaPlayerManager implementation. | 52 // MediaPlayerManager implementation. |
| 52 virtual MediaResourceGetter* GetMediaResourceGetter() OVERRIDE { | 53 virtual MediaResourceGetter* GetMediaResourceGetter() OVERRIDE { |
| 53 return NULL; | 54 return NULL; |
| 54 } | 55 } |
| 56 virtual MediaUrlInterceptor* GetMediaUrlInterceptor() OVERRIDE { |
| 57 return NULL; |
| 58 } |
| 55 virtual void OnTimeUpdate(int player_id, | 59 virtual void OnTimeUpdate(int player_id, |
| 56 base::TimeDelta current_time) OVERRIDE { | 60 base::TimeDelta current_time) OVERRIDE { |
| 57 timestamp_updated_ = true; | 61 timestamp_updated_ = true; |
| 58 } | 62 } |
| 59 virtual void OnMediaMetadataChanged( | 63 virtual void OnMediaMetadataChanged( |
| 60 int player_id, base::TimeDelta duration, int width, int height, | 64 int player_id, base::TimeDelta duration, int width, int height, |
| 61 bool success) OVERRIDE {} | 65 bool success) OVERRIDE {} |
| 62 virtual void OnPlaybackComplete(int player_id) OVERRIDE { | 66 virtual void OnPlaybackComplete(int player_id) OVERRIDE { |
| 63 playback_completed_ = true; | 67 playback_completed_ = true; |
| 64 if (message_loop_->is_running()) | 68 if (message_loop_->is_running()) |
| (...skipping 2130 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2195 | 2199 |
| 2196 DemuxerConfigs configs = CreateAudioDemuxerConfigs(kCodecVorbis, true); | 2200 DemuxerConfigs configs = CreateAudioDemuxerConfigs(kCodecVorbis, true); |
| 2197 DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged( | 2201 DemuxerData data = CreateReadFromDemuxerAckWithConfigChanged( |
| 2198 true, 0, configs); | 2202 true, 0, configs); |
| 2199 player_.OnDemuxerDataAvailable(data); | 2203 player_.OnDemuxerDataAvailable(data); |
| 2200 WaitForAudioDecodeDone(); | 2204 WaitForAudioDecodeDone(); |
| 2201 DecodeAudioDataUntilOutputBecomesAvailable(); | 2205 DecodeAudioDataUntilOutputBecomesAvailable(); |
| 2202 } | 2206 } |
| 2203 | 2207 |
| 2204 } // namespace media | 2208 } // namespace media |
| OLD | NEW |