Handle end of stream for media...

media/filters/audio_renderer_base.cc

 // Copyright (c) 2009 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/base/filter_host.h"
 #include "media/filters/audio_renderer_base.h"
 
 namespace media {
 
 // The maximum size of the queue, which also acts as the number of initial reads
@@ skipping 53 matching lines @@
   }
 
   // Defer initialization until all scheduled reads have completed.
   return OnInitialize(decoder_->media_format());
 }
 
 void AudioRendererBase::OnReadComplete(Buffer* buffer_in) {
   bool initialization_complete = false;
   {
     AutoLock auto_lock(lock_);
-    if (!stopped_) {
+    // If we have stopped don't enqueue, same for end of stream buffer since
+    // it has no data.
+    if (!stopped_ && !buffer_in->IsEndOfStream()) {
       queue_.push_back(buffer_in);
       DCHECK(queue_.size() <= max_queue_size_);
     }
 
-    // See if we're finally initialized.
-    // TODO(scherkus): handle end of stream cases where we'll never reach max
-    // queue size.
-    if (!initialized_ && queue_.size() == max_queue_size_) {
-      initialization_complete = true;
+    if (!initialized_) {
+      // We have completed the initialization when we preroll enough and hit
+      // the target queue size or the stream has ended.
+      if (queue_.size() == max_queue_size_ || buffer_in->IsEndOfStream())
+        initialization_complete = true;
     }
   }
 
   if (initialization_complete) {
-    initialized_ = true;
-    host_->InitializationComplete();
+    if (queue_.empty()) {
+      // If we say we have initialized but buffer queue is empty, raise an
+      // error.
+      host_->Error(PIPELINE_ERROR_NO_DATA);
+    } else {
+      initialized_ = true;
+      host_->InitializationComplete();
+    }
   }
 }
 
 // TODO(scherkus): clean up FillBuffer().. it's overly complex!!
 size_t AudioRendererBase::FillBuffer(uint8* dest, size_t dest_len,
                                      float rate) {
   size_t buffers_released = 0;
   size_t dest_written = 0;
   base::TimeDelta last_fill_buffer_time;
   {
@@ skipping 109 matching lines @@
   // TODO(scherkus): might be handy to support NULL parameters.
   std::string mime_type;
   return media_format.GetAsString(MediaFormat::kMimeType, &mime_type) &&
       media_format.GetAsInteger(MediaFormat::kChannels, channels_out) &&
       media_format.GetAsInteger(MediaFormat::kSampleRate, sample_rate_out) &&
       media_format.GetAsInteger(MediaFormat::kSampleBits, sample_bits_out) &&
       mime_type.compare(mime_type::kUncompressedAudio) == 0;
 }
 
 }  // namespace media