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

Unified Diff: media/test/pipeline_integration_test_base.h

Issue 1658303002: Create abstract interface for media::Pipeline. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix FakeMediaSource includes. 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
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/test/pipeline_integration_test_base.h
diff --git a/media/test/pipeline_integration_test_base.h b/media/test/pipeline_integration_test_base.h
index 4f4bd2f33cc6c4bb31ff747f83dde92ac0d8c961..d920fb9cef5249be89646f2b4931e83edaaffc10 100644
--- a/media/test/pipeline_integration_test_base.h
+++ b/media/test/pipeline_integration_test_base.h
@@ -15,7 +15,8 @@
#include "media/base/demuxer.h"
#include "media/base/media_keys.h"
#include "media/base/null_video_sink.h"
-#include "media/base/pipeline.h"
+#include "media/base/pipeline_impl.h"
+#include "media/base/pipeline_status.h"
#include "media/base/text_track.h"
#include "media/base/text_track_config.h"
#include "media/base/video_frame.h"
@@ -75,7 +76,7 @@ class PipelineIntegrationTestBase {
// benchmarking purposes (e.g., underflow is disabled to ensure consistent
// hashes). May be combined using the bitwise or operator (and as such must
// have values that are powers of two).
- enum TestTypeFlags { kHashed = 1, kClockless = 2};
+ enum TestTypeFlags { kHashed = 1, kClockless = 2 };
PipelineStatus Start(const std::string& filename, uint8_t test_type);
void Play();
@@ -108,7 +109,7 @@ class PipelineIntegrationTestBase {
bool clockless_playback_;
scoped_ptr<Demuxer> demuxer_;
scoped_ptr<DataSource> data_source_;
- scoped_ptr<Pipeline> pipeline_;
+ scoped_ptr<PipelineImpl> pipeline_;
scoped_refptr<NullAudioSink> audio_sink_;
scoped_refptr<ClocklessAudioSink> clockless_audio_sink_;
scoped_ptr<NullVideoSink> video_sink_;
« 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