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

Unified Diff: media/mojo/services/media_resource_shim.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/mojo/services/media_resource_shim.h
diff --git a/media/mojo/services/demuxer_stream_provider_shim.h b/media/mojo/services/media_resource_shim.h
similarity index 63%
rename from media/mojo/services/demuxer_stream_provider_shim.h
rename to media/mojo/services/media_resource_shim.h
index b1b6da9a1a30a33e79ed9530a8ddecefab93e81b..fa8a51461f5c5a8ea370cb7c14ca2c7fa408743f 100644
--- a/media/mojo/services/demuxer_stream_provider_shim.h
+++ b/media/mojo/services/media_resource_shim.h
@@ -2,31 +2,32 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_
-#define MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_
+#ifndef MEDIA_MOJO_SERVICES_MEDIA_RESOURCE_SHIM_H_
+#define MEDIA_MOJO_SERVICES_MEDIA_RESOURCE_SHIM_H_
#include <stddef.h>
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
-#include "media/base/demuxer_stream_provider.h"
+#include "media/base/media_resource.h"
#include "media/mojo/services/mojo_demuxer_stream_adapter.h"
namespace media {
-// DemuxerStreamProvider shim for mojom::DemuxerStreams.
-class DemuxerStreamProviderShim : public DemuxerStreamProvider {
+// MediaResource shim for mojom::DemuxerStreams.
+class MediaResourceShim : public MediaResource {
public:
// Constructs the shim; at least a single audio or video stream must be
// provided. |demuxer_ready_cb| will be called once the streams have been
// initialized. Calling any method before then is an error.
- DemuxerStreamProviderShim(std::vector<mojom::DemuxerStreamPtr> streams,
- const base::Closure& demuxer_ready_cb);
- ~DemuxerStreamProviderShim() override;
+ MediaResourceShim(std::vector<mojom::DemuxerStreamPtr> streams,
+ const base::Closure& demuxer_ready_cb);
+ ~MediaResourceShim() override;
- // DemuxerStreamProvider interface.
- DemuxerStream* GetStream(DemuxerStream::Type type) override;
+ // MediaResource interface.
+ std::vector<DemuxerStream*> GetStreams() override;
+ void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb) override;
private:
// Called as each mojom::DemuxerStream becomes ready. Once all streams
@@ -45,11 +46,11 @@ class DemuxerStreamProviderShim : public DemuxerStreamProvider {
size_t streams_ready_;
// WeakPtrFactorys must always be the last member variable.
- base::WeakPtrFactory<DemuxerStreamProviderShim> weak_factory_;
+ base::WeakPtrFactory<MediaResourceShim> weak_factory_;
- DISALLOW_COPY_AND_ASSIGN(DemuxerStreamProviderShim);
+ DISALLOW_COPY_AND_ASSIGN(MediaResourceShim);
};
} // namespace media
-#endif // MEDIA_MOJO_SERVICES_DEMUXER_STREAM_PROVIDER_SHIM_H_
+#endif // MEDIA_MOJO_SERVICES_MEDIA_RESOURCE_SHIM_H_

Powered by Google App Engine
This is Rietveld 408576698