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

Unified Diff: media/filters/dummy_demuxer.h

Issue 7867051: Introduce AudioDecoderConfig to migrate away from GetAVStream(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: samples_per_second Created 9 years, 3 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/filters/chunk_demuxer_unittest.cc ('k') | media/filters/dummy_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/dummy_demuxer.h
diff --git a/media/filters/dummy_demuxer.h b/media/filters/dummy_demuxer.h
index 272d1e4896b19d0d8f547f1b78d9f5359482b2eb..1b74d010c9abbd0ecde1ff41ddafb3ffa60514d8 100644
--- a/media/filters/dummy_demuxer.h
+++ b/media/filters/dummy_demuxer.h
@@ -11,6 +11,7 @@
#include <vector>
+#include "media/base/audio_decoder_config.h"
#include "media/base/demuxer.h"
namespace media {
@@ -22,12 +23,14 @@ class DummyDemuxerStream : public DemuxerStream {
// DemuxerStream implementation.
virtual void Read(const ReadCallback& read_callback) OVERRIDE;
virtual Type type() OVERRIDE;
+ virtual const AudioDecoderConfig& audio_decoder_config() OVERRIDE;
virtual void EnableBitstreamConverter() OVERRIDE;
private:
virtual ~DummyDemuxerStream();
Type type_;
+ AudioDecoderConfig audio_config_;
DISALLOW_COPY_AND_ASSIGN(DummyDemuxerStream);
};
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | media/filters/dummy_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698