Fix EOS buffer handling in spork.

media/mojo/services/mojo_demuxer_stream_impl.cc

 // Copyright 2014 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_demuxer_stream_impl.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
@@ skipping 28 matching lines @@
     // Status obtained via Run() below.
     if (stream_->type() == media::DemuxerStream::AUDIO) {
       client()->OnAudioDecoderConfigChanged(
           mojo::AudioDecoderConfig::From(stream_->audio_decoder_config()));
     } else if (stream_->type() == media::DemuxerStream::VIDEO) {
       client()->OnVideoDecoderConfigChanged(
           mojo::VideoDecoderConfig::From(stream_->video_decoder_config()));
     }
   }
 
-  // Serialize the data section of the DecoderBuffer into our pipe.
-  uint32_t num_bytes = buffer->data_size();
-  CHECK_EQ(WriteDataRaw(stream_pipe_.get(), buffer->data(), &num_bytes,
-                        MOJO_READ_DATA_FLAG_ALL_OR_NONE),
-           MOJO_RESULT_OK);
-  CHECK_EQ(num_bytes, static_cast<uint32_t>(buffer->data_size()));
+  if (!buffer->end_of_stream()) {
+    // Serialize the data section of the DecoderBuffer into our pipe.
+    uint32_t num_bytes = buffer->data_size();
+    CHECK_EQ(WriteDataRaw(stream_pipe_.get(), buffer->data(), &num_bytes,
+                          MOJO_READ_DATA_FLAG_ALL_OR_NONE),
+             MOJO_RESULT_OK);
+    CHECK_EQ(num_bytes, static_cast<uint32_t>(buffer->data_size()));
+  }
 
   // TODO(dalecurtis): Once we can write framed data to the DataPipe, fill via
   // the producer handle and then read more to keep the pipe full.  Waiting for
   // space can be accomplished using an AsyncWaiter.
   callback.Run(static_cast<mojo::DemuxerStream::Status>(status),
                mojo::MediaDecoderBuffer::From(buffer));
 }
 
 void MojoDemuxerStreamImpl::DidConnect() {
   // This is called when our DemuxerStreamClient has connected itself and is
@@ skipping 22 matching lines @@
     // Other types don't require a lot of room, so use a smaller pipe.
     options.capacity_num_bytes = 512 * 1024;
   }
 
   mojo::DataPipe data_pipe(options);
   stream_pipe_ = data_pipe.producer_handle.Pass();
   client()->OnStreamReady(data_pipe.consumer_handle.Pass());
 }
 
 }  // namespace media