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

Unified Diff: media/filters/adaptive_demuxer.h

Issue 7452016: Remove MediaFormat once and for all. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: Created 9 years, 5 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/base/pipeline_impl_unittest.cc ('k') | media/filters/adaptive_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/adaptive_demuxer.h
diff --git a/media/filters/adaptive_demuxer.h b/media/filters/adaptive_demuxer.h
index d6075ef43d7436098559e291c74b64dd04c108c3..73fd7b6c246286629def5140330ed68678229943 100644
--- a/media/filters/adaptive_demuxer.h
+++ b/media/filters/adaptive_demuxer.h
@@ -18,7 +18,6 @@
#include "media/base/filter_factories.h"
#include "media/base/filters.h"
#include "media/base/pipeline.h"
-#include "media/base/media_format.h"
namespace media {
@@ -50,7 +49,8 @@ class AdaptiveDemuxerStream : public DemuxerStream {
typedef base::Callback<void(base::TimeDelta, SeekFunctionCB)> SeekFunction;
// Keeps references to the passed-in streams. |streams| must be non-empty and
- // all the streams in it must agree on type and media_format (or be NULL).
+ // all the streams in it must agree on type.
+ //
// |initial_stream| must be a valid index into |streams| and specifies the
// current stream on construction.
AdaptiveDemuxerStream(StreamVector const& streams, int initial_stream);
@@ -68,7 +68,6 @@ class AdaptiveDemuxerStream : public DemuxerStream {
// DemuxerStream methods.
virtual void Read(const ReadCallback& read_callback);
virtual Type type();
- virtual const MediaFormat& media_format();
virtual void EnableBitstreamConverter();
virtual AVStream* GetAVStream();
« no previous file with comments | « media/base/pipeline_impl_unittest.cc ('k') | media/filters/adaptive_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698