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

Unified Diff: media/base/fake_demuxer_stream.h

Issue 1137263002: Chromecast: adds CmaRenderer test coverage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moved FakeDemuxerStreamProvider to media/base/ Created 5 years, 7 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/base/fake_demuxer_stream.h
diff --git a/media/filters/fake_demuxer_stream.h b/media/base/fake_demuxer_stream.h
similarity index 82%
rename from media/filters/fake_demuxer_stream.h
rename to media/base/fake_demuxer_stream.h
index fc85f7daba93679082b46ff63ce5d2a577b118ca..ebf1668f2f5199e952b12476c0cdb09019f4b1b7 100644
--- a/media/filters/fake_demuxer_stream.h
+++ b/media/base/fake_demuxer_stream.h
@@ -2,13 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MEDIA_FILTERS_FAKE_DEMUXER_STREAM_H_
-#define MEDIA_FILTERS_FAKE_DEMUXER_STREAM_H_
+#ifndef MEDIA_BASE_FAKE_DEMUXER_STREAM_H_
+#define MEDIA_BASE_FAKE_DEMUXER_STREAM_H_
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/demuxer_stream.h"
+#include "media/base/demuxer_stream_provider.h"
#include "media/base/video_decoder_config.h"
namespace base {
@@ -102,6 +103,21 @@ class FakeDemuxerStream : public DemuxerStream {
DISALLOW_COPY_AND_ASSIGN(FakeDemuxerStream);
};
+class FakeDemuxerStreamProvider : public DemuxerStreamProvider {
+ public:
+ FakeDemuxerStreamProvider(int num_video_configs,
+ int num_video_buffers_in_one_config,
+ bool is_video_encrypted);
+ ~FakeDemuxerStreamProvider() override;
+
+ DemuxerStream* GetStream(DemuxerStream::Type type) override;
xhwang 2015/05/14 22:10:10 // DemuxerStreamProvider implementation.
gunsch 2015/05/14 22:15:09 Done.
+
+ private:
+ ::media::FakeDemuxerStream fake_video_stream_;
xhwang 2015/05/14 22:10:10 Drop the ::media:: part :)
gunsch 2015/05/14 22:15:09 Done.
+
+ DISALLOW_COPY_AND_ASSIGN(FakeDemuxerStreamProvider);
+};
+
} // namespace media
-#endif // MEDIA_FILTERS_FAKE_DEMUXER_STREAM_H_
+#endif // MEDIA_BASE_FAKE_DEMUXER_STREAM_H_

Powered by Google App Engine
This is Rietveld 408576698