Index: services/media/framework/parts/decoder.h |
diff --git a/services/media/framework/parts/decoder.h b/services/media/framework/parts/decoder.h |
index 1818dc67ba87e6f446536297fd085ebad9bd807b..0a9bf001adfa68c633fc5d1d20d64b606c8682d2 100644 |
--- a/services/media/framework/parts/decoder.h |
+++ b/services/media/framework/parts/decoder.h |
@@ -5,35 +5,31 @@ |
#ifndef SERVICES_MEDIA_FRAMEWORK_PARTS_DECODER_H_ |
#define SERVICES_MEDIA_FRAMEWORK_PARTS_DECODER_H_ |
-#include "services/media/framework/allocator.h" |
-#include "services/media/framework/models/packet_transform.h" |
+#include "services/media/framework/models/transform.h" |
#include "services/media/framework/packet.h" |
+#include "services/media/framework/payload_allocator.h" |
#include "services/media/framework/result.h" |
#include "services/media/framework/stream_type.h" |
namespace mojo { |
namespace media { |
-class Decoder; |
- |
-typedef SharedPtr<Decoder, PacketTransform> DecoderPtr; |
- |
// Abstract base class for transforms that decode compressed media. |
-class Decoder : public PacketTransform { |
+class Decoder : public Transform { |
public: |
// Creates a Decoder object for a given stream type. |
static Result Create( |
- const StreamTypePtr& stream_type, |
- DecoderPtr* decoder_out); |
+ const std::unique_ptr<StreamType>& stream_type, |
+ std::shared_ptr<Decoder>* decoder_out); |
~Decoder() override {} |
// Returns the type of the stream the decoder will produce. |
- virtual StreamTypePtr output_stream_type() = 0; |
+ virtual std::unique_ptr<StreamType> output_stream_type() = 0; |
protected: |
// Initializes the decoder. Called by Decoder::Create. |
- virtual Result Init(const StreamTypePtr& stream_type) = 0; |
+ virtual Result Init(const std::unique_ptr<StreamType>& stream_type) = 0; |
}; |
} // namespace media |