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

Unified Diff: media/base/demuxer.h

Issue 2491043003: MediaResource refactoring to support multiple streams (Closed)
Patch Set: rebase Created 3 years, 11 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/demuxer.h
diff --git a/media/base/demuxer.h b/media/base/demuxer.h
index 6fa71a50eb64da1caa666d88d064703d24ae3942..71cdc6d14a91518950aa7d1dc943568937dff761 100644
--- a/media/base/demuxer.h
+++ b/media/base/demuxer.h
@@ -14,9 +14,9 @@
#include "base/time/time.h"
#include "media/base/data_source.h"
#include "media/base/demuxer_stream.h"
-#include "media/base/demuxer_stream_provider.h"
#include "media/base/eme_constants.h"
#include "media/base/media_export.h"
+#include "media/base/media_resource.h"
#include "media/base/media_track.h"
#include "media/base/pipeline_status.h"
#include "media/base/ranges.h"
@@ -58,7 +58,7 @@ class MEDIA_EXPORT DemuxerHost {
virtual ~DemuxerHost();
};
-class MEDIA_EXPORT Demuxer : public DemuxerStreamProvider {
+class MEDIA_EXPORT Demuxer : public MediaResource {
public:
// A new potentially encrypted stream has been parsed.
// First parameter - The type of initialization data.

Powered by Google App Engine
This is Rietveld 408576698