Handle unexpected MojoWait() result in MojoAudioDecoderService

media/mojo/services/mojo_audio_decoder.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.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
@@ skipping 61 matching lines @@
   output_cb_ = output_cb;
 
   // Using base::Unretained(this) is safe because |this| owns |remote_decoder_|,
   // and the callback won't be dispatched if |remote_decoder_| is destroyed.
   remote_decoder_->Initialize(
       binding_.CreateInterfacePtrAndBind(),
       mojom::AudioDecoderConfig::From(config), cdm_id,
       base::Bind(&MojoAudioDecoder::OnInitialized, base::Unretained(this)));
 }
 
-void MojoAudioDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
+void MojoAudioDecoder::Decode(const scoped_refptr<DecoderBuffer>& media_buffer,
                               const DecodeCB& decode_cb) {
   DVLOG(3) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (has_connection_error_) {
     task_runner_->PostTask(FROM_HERE,
                            base::Bind(decode_cb, DecodeStatus::DECODE_ERROR));
     return;
   }
 
+  mojom::DecoderBufferPtr buffer = TransferDecoderBuffer(media_buffer);
+  if (!buffer) {
+    task_runner_->PostTask(FROM_HERE,
+                           base::Bind(decode_cb, DecodeStatus::DECODE_ERROR));
+    return;
+  }
+
   DCHECK(decode_cb_.is_null());
   decode_cb_ = decode_cb;
 
   remote_decoder_->Decode(
-      TransferDecoderBuffer(buffer),
+      std::move(buffer),
       base::Bind(&MojoAudioDecoder::OnDecodeStatus, base::Unretained(this)));
 }
 
 void MojoAudioDecoder::Reset(const base::Closure& closure) {
   DVLOG(2) << __FUNCTION__;
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (has_connection_error_) {
     if (!decode_cb_.is_null()) {
       task_runner_->PostTask(FROM_HERE,
@@ skipping 108 matching lines @@
 
 mojom::DecoderBufferPtr MojoAudioDecoder::TransferDecoderBuffer(
     const scoped_refptr<DecoderBuffer>& media_buffer) {
   mojom::DecoderBufferPtr buffer = mojom::DecoderBuffer::From(media_buffer);
   if (media_buffer->end_of_stream())
     return buffer;
 
   // Serialize the data section of the DecoderBuffer into our pipe.
   uint32_t num_bytes = base::checked_cast<uint32_t>(media_buffer->data_size());
   DCHECK_GT(num_bytes, 0u);
-  CHECK_EQ(WriteDataRaw(producer_handle_.get(), media_buffer->data(),
-                        &num_bytes, MOJO_READ_DATA_FLAG_ALL_OR_NONE),
-           MOJO_RESULT_OK);
-  CHECK_EQ(num_bytes, static_cast<uint32_t>(media_buffer->data_size()));
+  MojoResult result =
+      WriteDataRaw(producer_handle_.get(), media_buffer->data(), &num_bytes,
+                   MOJO_WRITE_DATA_FLAG_ALL_OR_NONE);
+  if (result != MOJO_RESULT_OK || num_bytes != media_buffer->data_size())
+    return nullptr;

[xhwang, 2016/05/19 18:59:59]

Can you put a DVLOG(1) here?

[Tima Vaisburd, 2016/05/19 22:00:57]

Done.

+
   return buffer;
 }
 
 }  // namespace media