media: Fix MojoAudioDecoder reinitialization

media/mojo/services/mojo_audio_decoder_service.cc

 // 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.
 
 #include "media/mojo/services/mojo_audio_decoder_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "media/base/cdm_context.h"
 #include "media/base/content_decryption_module.h"
 #include "media/mojo/common/media_type_converters.h"
 #include "media/mojo/common/mojo_decoder_buffer_converter.h"
 #include "media/mojo/services/mojo_cdm_service_context.h"
 
 namespace media {
 
 MojoAudioDecoderService::MojoAudioDecoderService(
     base::WeakPtr<MojoCdmServiceContext> mojo_cdm_service_context,
     std::unique_ptr<media::AudioDecoder> decoder)
     : mojo_cdm_service_context_(mojo_cdm_service_context),
       decoder_(std::move(decoder)),
       weak_factory_(this) {
   weak_this_ = weak_factory_.GetWeakPtr();
 }
 
 MojoAudioDecoderService::~MojoAudioDecoderService() {}
 
+void MojoAudioDecoderService::Construct(
+    mojom::AudioDecoderClientAssociatedPtrInfo client) {
+  DVLOG(1) << __func__;
+  client_.Bind(std::move(client));
+}
+
 void MojoAudioDecoderService::Initialize(
-    mojom::AudioDecoderClientAssociatedPtrInfo client,
     mojom::AudioDecoderConfigPtr config,
     int32_t cdm_id,
     const InitializeCallback& callback) {
   DVLOG(1) << __func__ << " "
            << config.To<media::AudioDecoderConfig>().AsHumanReadableString();
 
   // Get CdmContext from cdm_id if the stream is encrypted.
   CdmContext* cdm_context = nullptr;
   scoped_refptr<ContentDecryptionModule> cdm;
   if (config.To<media::AudioDecoderConfig>().is_encrypted()) {
@@ skipping 11 matching lines @@
     }
 
     cdm_context = cdm->GetCdmContext();
     if (!cdm_context) {
       DVLOG(1) << "CDM context not available for CDM id: " << cdm_id;
       callback.Run(false, false);
       return;
     }
   }
 
-  client_.Bind(std::move(client));
-
   decoder_->Initialize(
       config.To<media::AudioDecoderConfig>(), cdm_context,
       base::Bind(&MojoAudioDecoderService::OnInitialized, weak_this_, callback,
                  cdm),
       base::Bind(&MojoAudioDecoderService::OnAudioBufferReady, weak_this_));
 }
 
 void MojoAudioDecoderService::SetDataSource(
     mojo::ScopedDataPipeConsumerHandle receive_pipe) {
   DVLOG(1) << __func__;
@@ skipping 61 matching lines @@
 
 void MojoAudioDecoderService::OnAudioBufferReady(
     const scoped_refptr<AudioBuffer>& audio_buffer) {
   DVLOG(1) << __func__;
 
   // TODO(timav): Use DataPipe.
   client_->OnBufferDecoded(mojom::AudioBuffer::From(audio_buffer));
 }
 
 }  // namespace media