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

Side by Side Diff: media/test/pipeline_integration_test_base.h

Issue 2815303006: Convert MediaLog from being ref counted to owned by WebMediaPlayer. (Closed)
Patch Set: Rebase. Created 3 years, 8 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/test/pipeline_integration_test.cc ('k') | media/test/pipeline_integration_test_base.cc » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ 5 #ifndef MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
6 #define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ 6 #define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <memory> 9 #include <memory>
10 10
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 base::TimeDelta GetAudioTime(); 120 base::TimeDelta GetAudioTime();
121 121
122 // Sets a callback to handle EME "encrypted" event. Must be called to test 122 // Sets a callback to handle EME "encrypted" event. Must be called to test
123 // potentially encrypted media. 123 // potentially encrypted media.
124 void set_encrypted_media_init_data_cb( 124 void set_encrypted_media_init_data_cb(
125 const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb) { 125 const Demuxer::EncryptedMediaInitDataCB& encrypted_media_init_data_cb) {
126 encrypted_media_init_data_cb_ = encrypted_media_init_data_cb; 126 encrypted_media_init_data_cb_ = encrypted_media_init_data_cb;
127 } 127 }
128 128
129 protected: 129 protected:
130 MediaLog media_log_;
130 base::MessageLoop message_loop_; 131 base::MessageLoop message_loop_;
131 base::MD5Context md5_context_; 132 base::MD5Context md5_context_;
132 bool hashing_enabled_; 133 bool hashing_enabled_;
133 bool clockless_playback_; 134 bool clockless_playback_;
134 135
135 // TaskScheduler is used only for FFmpegDemuxer. 136 // TaskScheduler is used only for FFmpegDemuxer.
136 std::unique_ptr<base::test::ScopedTaskScheduler> task_scheduler_; 137 std::unique_ptr<base::test::ScopedTaskScheduler> task_scheduler_;
137 std::unique_ptr<Demuxer> demuxer_; 138 std::unique_ptr<Demuxer> demuxer_;
138 std::unique_ptr<DataSource> data_source_; 139 std::unique_ptr<DataSource> data_source_;
139 std::unique_ptr<PipelineImpl> pipeline_; 140 std::unique_ptr<PipelineImpl> pipeline_;
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 const AddTextTrackDoneCB& done_cb)); 204 const AddTextTrackDoneCB& done_cb));
204 MOCK_METHOD0(OnWaitingForDecryptionKey, void(void)); 205 MOCK_METHOD0(OnWaitingForDecryptionKey, void(void));
205 MOCK_METHOD1(OnVideoNaturalSizeChange, void(const gfx::Size&)); 206 MOCK_METHOD1(OnVideoNaturalSizeChange, void(const gfx::Size&));
206 MOCK_METHOD1(OnVideoOpacityChange, void(bool)); 207 MOCK_METHOD1(OnVideoOpacityChange, void(bool));
207 MOCK_METHOD0(OnVideoAverageKeyframeDistanceUpdate, void()); 208 MOCK_METHOD0(OnVideoAverageKeyframeDistanceUpdate, void());
208 }; 209 };
209 210
210 } // namespace media 211 } // namespace media
211 212
212 #endif // MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ 213 #endif // MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
OLDNEW
« no previous file with comments | « media/test/pipeline_integration_test.cc ('k') | media/test/pipeline_integration_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698