Index: media/test/pipeline_integration_test_base.cc |
diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc |
index 11da971031b7d1cc701d2bd7496c0f0601eacd33..346c59214ded937ec4281b63c2b97f91a2117061 100644 |
--- a/media/test/pipeline_integration_test_base.cc |
+++ b/media/test/pipeline_integration_test_base.cc |
@@ -10,6 +10,7 @@ |
#include "base/memory/scoped_vector.h" |
#include "media/base/cdm_context.h" |
#include "media/base/media_log.h" |
+#include "media/base/media_tracks.h" |
#include "media/base/test_data_util.h" |
#include "media/filters/chunk_demuxer.h" |
#if !defined(MEDIA_DISABLE_FFMPEG) |
@@ -76,6 +77,11 @@ void PipelineIntegrationTestBase::DemuxerEncryptedMediaInitDataCB( |
encrypted_media_init_data_cb_.Run(type, init_data); |
} |
+void PipelineIntegrationTestBase::DemuxerMediaTracksUpdatedCB( |
+ scoped_ptr<MediaTracks> tracks) { |
+ CHECK(tracks); |
+} |
+ |
void PipelineIntegrationTestBase::OnEnded() { |
DCHECK(!ended_); |
ended_ = true; |
@@ -240,10 +246,14 @@ void PipelineIntegrationTestBase::CreateDemuxer(const std::string& filename) { |
base::Bind(&PipelineIntegrationTestBase::DemuxerEncryptedMediaInitDataCB, |
base::Unretained(this)); |
+ Demuxer::MediaTracksUpdatedCB tracks_updated_cb = |
+ base::Bind(&PipelineIntegrationTestBase::DemuxerMediaTracksUpdatedCB, |
+ base::Unretained(this)); |
+ |
#if !defined(MEDIA_DISABLE_FFMPEG) |
- demuxer_ = scoped_ptr<Demuxer>( |
- new FFmpegDemuxer(message_loop_.task_runner(), data_source_.get(), |
- encrypted_media_init_data_cb, new MediaLog())); |
+ demuxer_ = scoped_ptr<Demuxer>(new FFmpegDemuxer( |
+ message_loop_.task_runner(), data_source_.get(), |
+ encrypted_media_init_data_cb, tracks_updated_cb, new MediaLog())); |
#endif |
} |