| Index: services/media/framework/models/multistream_source.h
|
| diff --git a/services/media/framework/models/multistream_packet_source.h b/services/media/framework/models/multistream_source.h
|
| similarity index 61%
|
| rename from services/media/framework/models/multistream_packet_source.h
|
| rename to services/media/framework/models/multistream_source.h
|
| index b5072f1e6b1284443f5525aa012bc77a32a3abe3..01a82e9c1753311c6efa2b930bd5f8bd1389736c 100644
|
| --- a/services/media/framework/models/multistream_packet_source.h
|
| +++ b/services/media/framework/models/multistream_source.h
|
| @@ -2,11 +2,10 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MOJO_MEDIA_MODELS_MULTISTREAM_PACKET_SOURCE_H_
|
| -#define MOJO_MEDIA_MODELS_MULTISTREAM_PACKET_SOURCE_H_
|
| -
|
| -#include <memory>
|
| +#ifndef MOJO_MEDIA_MODELS_MULTISTREAM_SOURCE_H_
|
| +#define MOJO_MEDIA_MODELS_MULTISTREAM_SOURCE_H_
|
|
|
| +#include "services/media/framework/models/part.h"
|
| #include "services/media/framework/packet.h"
|
|
|
| namespace mojo {
|
| @@ -14,22 +13,20 @@ namespace media {
|
|
|
| // Synchronous source of packets for multiple streams. This is currently used
|
| // by Demux, though it would be better if Demux were asynchronous.
|
| -class MultiStreamPacketSource {
|
| +class MultistreamSource : public Part {
|
| public:
|
| - virtual ~MultiStreamPacketSource() {}
|
| + ~MultistreamSource() override {}
|
|
|
| // Returns the number of streams the source produces.
|
| - virtual uint32_t stream_count() const = 0;
|
| + virtual size_t stream_count() const = 0;
|
|
|
| // Gets a packet for the stream indicated via stream_index_out. This call
|
| // should always produce a packet until end-of-stream. The caller is
|
| // responsible for releasing the packet.
|
| - virtual PacketPtr PullPacket(uint32_t *stream_index_out) = 0;
|
| + virtual PacketPtr PullPacket(size_t *stream_index_out) = 0;
|
| };
|
|
|
| -typedef std::shared_ptr<MultiStreamPacketSource> MultiStreamPacketSourcePtr;
|
| -
|
| } // namespace media
|
| } // namespace mojo
|
|
|
| -#endif // MOJO_MEDIA_MODELS_MULTISTREAM_PACKET_SOURCE_H_
|
| +#endif // MOJO_MEDIA_MODELS_MULTISTREAM_SOURCE_H_
|
|
|