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

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

Issue 1922333002: Implement mapping blink track id to demuxer streams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR feedback Created 4 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
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 #include "media/test/pipeline_integration_test_base.h" 5 #include "media/test/pipeline_integration_test_base.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 EmeInitDataType type, 76 EmeInitDataType type,
77 const std::vector<uint8_t>& init_data) { 77 const std::vector<uint8_t>& init_data) {
78 DCHECK(!init_data.empty()); 78 DCHECK(!init_data.empty());
79 CHECK(!encrypted_media_init_data_cb_.is_null()); 79 CHECK(!encrypted_media_init_data_cb_.is_null());
80 encrypted_media_init_data_cb_.Run(type, init_data); 80 encrypted_media_init_data_cb_.Run(type, init_data);
81 } 81 }
82 82
83 void PipelineIntegrationTestBase::DemuxerMediaTracksUpdatedCB( 83 void PipelineIntegrationTestBase::DemuxerMediaTracksUpdatedCB(
84 std::unique_ptr<MediaTracks> tracks) { 84 std::unique_ptr<MediaTracks> tracks) {
85 CHECK(tracks); 85 CHECK(tracks);
86 CHECK(demuxer_);
87
88 // Generate track ids.
89 std::vector<unsigned> track_ids;
90 for (unsigned track_id = 1; track_id <= tracks->tracks().size(); ++track_id) {
91 track_ids.push_back(track_id);
92 }
93
94 demuxer_->OnTrackIdsAssigned(*tracks.get(), track_ids);
86 } 95 }
87 96
88 void PipelineIntegrationTestBase::OnEnded() { 97 void PipelineIntegrationTestBase::OnEnded() {
89 DCHECK(!ended_); 98 DCHECK(!ended_);
90 ended_ = true; 99 ended_ = true;
91 pipeline_status_ = PIPELINE_OK; 100 pipeline_status_ = PIPELINE_OK;
92 message_loop_.PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); 101 message_loop_.PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
93 } 102 }
94 103
95 bool PipelineIntegrationTestBase::WaitUntilOnEnded() { 104 bool PipelineIntegrationTestBase::WaitUntilOnEnded() {
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 base::Unretained(this), wait_time), 267 base::Unretained(this), wait_time),
259 base::TimeDelta::FromMilliseconds(10)); 268 base::TimeDelta::FromMilliseconds(10));
260 message_loop_.Run(); 269 message_loop_.Run();
261 return (pipeline_status_ == PIPELINE_OK); 270 return (pipeline_status_ == PIPELINE_OK);
262 } 271 }
263 272
264 void PipelineIntegrationTestBase::CreateDemuxer( 273 void PipelineIntegrationTestBase::CreateDemuxer(
265 std::unique_ptr<DataSource> data_source) { 274 std::unique_ptr<DataSource> data_source) {
266 data_source_ = std::move(data_source); 275 data_source_ = std::move(data_source);
267 276
268 Demuxer::MediaTracksUpdatedCB tracks_updated_cb =
269 base::Bind(&PipelineIntegrationTestBase::DemuxerMediaTracksUpdatedCB,
270 base::Unretained(this));
271
272 #if !defined(MEDIA_DISABLE_FFMPEG) 277 #if !defined(MEDIA_DISABLE_FFMPEG)
273 demuxer_ = std::unique_ptr<Demuxer>(new FFmpegDemuxer( 278 demuxer_ = std::unique_ptr<Demuxer>(new FFmpegDemuxer(
274 message_loop_.task_runner(), data_source_.get(), 279 message_loop_.task_runner(), data_source_.get(),
275 base::Bind(&PipelineIntegrationTestBase::DemuxerEncryptedMediaInitDataCB, 280 base::Bind(&PipelineIntegrationTestBase::DemuxerEncryptedMediaInitDataCB,
276 base::Unretained(this)), 281 base::Unretained(this)),
277 tracks_updated_cb, new MediaLog())); 282 base::Bind(&PipelineIntegrationTestBase::DemuxerMediaTracksUpdatedCB,
283 base::Unretained(this)),
284 new MediaLog()));
278 #endif 285 #endif
279 } 286 }
280 287
281 std::unique_ptr<Renderer> PipelineIntegrationTestBase::CreateRenderer() { 288 std::unique_ptr<Renderer> PipelineIntegrationTestBase::CreateRenderer() {
282 ScopedVector<VideoDecoder> video_decoders; 289 ScopedVector<VideoDecoder> video_decoders;
283 #if !defined(MEDIA_DISABLE_LIBVPX) 290 #if !defined(MEDIA_DISABLE_LIBVPX)
284 video_decoders.push_back(new VpxVideoDecoder()); 291 video_decoders.push_back(new VpxVideoDecoder());
285 #endif // !defined(MEDIA_DISABLE_LIBVPX) 292 #endif // !defined(MEDIA_DISABLE_LIBVPX)
286 293
287 #if !defined(MEDIA_DISABLE_FFMPEG) 294 #if !defined(MEDIA_DISABLE_FFMPEG)
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 DCHECK(clockless_playback_); 388 DCHECK(clockless_playback_);
382 return clockless_audio_sink_->render_time(); 389 return clockless_audio_sink_->render_time();
383 } 390 }
384 391
385 base::TimeTicks DummyTickClock::NowTicks() { 392 base::TimeTicks DummyTickClock::NowTicks() {
386 now_ += base::TimeDelta::FromSeconds(60); 393 now_ += base::TimeDelta::FromSeconds(60);
387 return now_; 394 return now_;
388 } 395 }
389 396
390 } // namespace media 397 } // namespace media
OLDNEW
« media/blink/webmediaplayer_impl.cc ('K') | « media/test/pipeline_integration_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698