Implement MojoAudioDecoder

media/mojo/services/mojo_audio_decoder.h

 // 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_AUDIO_DECODER_H_
 #define MEDIA_MOJO_SERVICES_MOJO_AUDIO_DECODER_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/audio_decoder.h"
 #include "media/mojo/interfaces/audio_decoder.mojom.h"
+#include "mojo/public/cpp/bindings/binding.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
 // An AudioDecoder that proxies to an interfaces::AudioDecoder.
-class MojoAudioDecoder : public AudioDecoder {
+class MojoAudioDecoder : public AudioDecoder,
+                         public interfaces::AudioDecoderClient {
  public:
   MojoAudioDecoder(scoped_refptr<base::SingleThreadTaskRunner> task_runner,
                    interfaces::AudioDecoderPtr remote_decoder);
   ~MojoAudioDecoder() final;
 
   // AudioDecoder implementation.
   std::string GetDisplayName() const final;
   void Initialize(const AudioDecoderConfig& config,
                   CdmContext* cdm_context,
                   const InitCB& init_cb,
                   const OutputCB& output_cb) final;
   void Decode(const scoped_refptr<DecoderBuffer>& buffer,
               const DecodeCB& decode_cb) final;
   void Reset(const base::Closure& closure) final;
   bool NeedsBitstreamConversion() const final;
 
+  //  AudioDecoderClient implementation.

[xhwang, 2016/03/18 02:19:43]

nit: drop one space

[Tima Vaisburd, 2016/03/18 19:05:49]

Done.

+  void OnBufferDecoded(interfaces::AudioBufferPtr buffer) final;
+
  private:
+  // Callback for connection error on |remote_renderer_|.

[xhwang, 2016/03/18 02:19:43]

s/renderer/decoder

[Tima Vaisburd, 2016/03/18 19:05:49]

Done.

+  void OnConnectionError();
+
+  // Called when |remote_decored_| finished initialization.

[xhwang, 2016/03/18 02:19:43]

decoder

[Tima Vaisburd, 2016/03/18 19:05:49]

Done.

+  void OnInitialized(bool status, bool needs_bitstream_conversion);
+
+  // Called when |remote_decoder_| accepted or rejected DecoderBuffer.
+  void OnDecodeStarted(interfaces::AudioDecoder::DecodeStatus decode_status);

[xhwang, 2016/03/18 02:19:43]

Started is not accurate.  It's possible that OnBufferDecoded() is called before
this callback. How about something like OnDecodeStatus?

[Tima Vaisburd, 2016/03/18 19:05:49]

Started is not accurate because the buffer can be rejected. I renamed to
OnDecodeStatus.
However I do not see how can OnBufferDecoded() come before OnDecodeStatus() for
this buffer. in MCAD everything is sequential and, I think, the order of IPC
messages is preserved? Or it is preserved within one pipe only?

[xhwang, 2016/03/18 19:17:17]

mojo_audio_decoder is generic, it should work with any AudioDecoder
implementation. You should code against the AudioDecoder API, which says that
the output_cb may be called before or after the decode_cb:

https://code.google.com/p/chromium/codesearch#chromium/src/media/base/audio_d...

[Tima Vaisburd, 2016/03/18 19:35:03]

I see. Acknowledged.

+
+  // called when |remote_decoder_| finished Reset() sequence.
+  void OnResetDone();
+
+  // Data.

[xhwang, 2016/03/18 02:19:43]

nit: seems not necessary..

[Tima Vaisburd, 2016/03/18 19:05:49]

Removed.

+
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
+
   interfaces::AudioDecoderPtr remote_decoder_;
 
+  // Binding for AudioDecoderClient, bound to the |task_runner_|.
+  mojo::Binding<AudioDecoderClient> binding_;
+
+  // We call these callbacks to pass the information to the pipeline.
+  InitCB init_cb_;
+  DecodeCB decode_cb_;
+  base::Closure reset_cb_;
+
+  // Flag that is set if we got connection error. Never cleared.
+  bool has_connection_error_;
+
+  // Flag telling Whether this decoder requires bitstream conversion.
+  // Passed from the |remote_decoder_| as a result of its initialization.
+  bool needs_bitstream_conversion_;
+
   DISALLOW_COPY_AND_ASSIGN(MojoAudioDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_AUDIO_DECODER_H_