Finish plumbing MojoVideoDecoder.

media/mojo/services/mojo_video_decoder_service.h

Index: media/mojo/services/mojo_video_decoder_service.h
diff --git a/media/mojo/services/mojo_video_decoder_service.h b/media/mojo/services/mojo_video_decoder_service.h
new file mode 100644
index 0000000000000000000000000000000000000000..4883e7d5b40f3746d5db1da5255785072503fb04
--- /dev/null
+++ b/media/mojo/services/mojo_video_decoder_service.h
@@ -0,0 +1,61 @@
+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef MEDIA_MOJO_SERVICES_MOJO_VIDEO_DECODER_SERVICE_H_
+#define MEDIA_MOJO_SERVICES_MOJO_VIDEO_DECODER_SERVICE_H_
+
+#include <memory>
+
+#include "base/macros.h"
+#include "base/memory/weak_ptr.h"
+#include "media/base/decode_status.h"
+#include "media/mojo/interfaces/video_decoder.mojom.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "mojo/public/cpp/system/data_pipe.h"
+
+namespace media {
+
+class MojoMediaClient;
+class VideoDecoder;
+class VideoFrame;
+
+class MojoVideoDecoderService : public interfaces::VideoDecoder {
+ public:
+  MojoVideoDecoderService(
+      mojo::InterfaceRequest<interfaces::VideoDecoder> request,
+      MojoMediaClient* mojo_media_client);
+  ~MojoVideoDecoderService() final;
+
+  // interfaces::VideoDecoder implementation
+  void Construct(interfaces::VideoDecoderClientPtr client,
+                 mojo::ScopedDataPipeConsumerHandle decoder_buffer_pipe) final;

[dcheng, 2016/05/11 22:15:06]

If no one is supposed to derive from this class, maybe just do:

class MojoVideoDecoderService final : public interfaces::VideoDecoder {

[sandersd (OOO until July 31), 2016/05/11 23:00:50]

Done.

(I had to leave in all the annotations though, because they still need an
override marking to make the compiler happy.)

+  void Initialize(interfaces::VideoDecoderConfigPtr config,
+                  bool low_delay,
+                  const InitializeCallback& callback) final;
+  void Decode(interfaces::DecoderBufferPtr buffer,
+              const DecodeCallback& callback) final;
+  void Reset(const ResetCallback& callback) final;
+
+ private:
+  void OnDecoderInitialized(const InitializeCallback& callback, bool success);
+  void OnDecoderDecoded(const DecodeCallback& callback, DecodeStatus status);
+  void OnDecoderOutput(const scoped_refptr<VideoFrame>& frame);
+  void OnDecoderReset(const ResetCallback& callback);
+
+  mojo::StrongBinding<interfaces::VideoDecoder> binding_;
+  interfaces::VideoDecoderClientPtr client_;
+  mojo::ScopedDataPipeConsumerHandle decoder_buffer_pipe_;
+
+  MojoMediaClient* mojo_media_client_;
+  std::unique_ptr<media::VideoDecoder> decoder_;
+
+  base::WeakPtr<MojoVideoDecoderService> weak_this_;
+  base::WeakPtrFactory<MojoVideoDecoderService> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(MojoVideoDecoderService);
+};
+
+}  // namespace media
+
+#endif  // MEDIA_MOJO_SERVICES_MOJO_VIDEO_DECODER_SERVICE_H_