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

Unified Diff: media/test/pipeline_integration_test_base.cc

Issue 1727243002: Unify media track info reporting on a demuxer level (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@tracks-impl-in-media
Patch Set: rebase Created 4 years, 10 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 side-by-side diff with in-line comments
Download patch
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 ac35ee2c498d2692ddc77f4a3b4f2b0f07510d09..01bd1c1f12e027638f784fa6cc7a2c723f5ef0c4 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)
@@ -79,6 +80,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;
@@ -262,12 +268,16 @@ void PipelineIntegrationTestBase::CreateDemuxer(
scoped_ptr<DataSource> data_source) {
data_source_ = std::move(data_source);
+ 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(),
base::Bind(&PipelineIntegrationTestBase::DemuxerEncryptedMediaInitDataCB,
base::Unretained(this)),
- new MediaLog()));
+ tracks_updated_cb, new MediaLog()));
#endif
}
« media/filters/media_source_state.cc ('K') | « media/test/pipeline_integration_test_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698