Return EOS when selected_range_ is NULL in SourceBufferStream

media/filters/source_buffer_stream.cc

 // Copyright (c) 2012 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/filters/source_buffer_stream.h"
 
 #include <algorithm>
 #include <map>
 #include <sstream>
 
@@ skipping 1081 matching lines @@
 
     // If the track buffer becomes empty, then try to set the selected range
     // based on the timestamp of this buffer being returned.
     if (track_buffer_.empty())
       SetSelectedRangeIfNeeded(last_output_buffer_timestamp_);
 
     return kSuccess;
   }
 
   if (!selected_range_ || !selected_range_->HasNextBuffer()) {
-    if (end_of_stream_ && IsEndSelected())
+    if (end_of_stream_ && (!selected_range_ || IsEndSelected()))

[wolenetz, 2015/05/05 20:51:35]

Interesting. Since IsEndSelected() is only used in two places (here, and in
IsSeekPending()), ISTM that IsSeekPending() might need similar support for
!selected_range_ (&& track_buffer_.empty()).
Would refactoring IsEndSelected() to instead be IsEndOfStreamReached() (and
include conditions involving track_buffer_.empty(), !selected_range_,
end_of_stream_) make both this line and IsSeekPending() more readable?

Ideally, SourceBufferStream unit tests could demonstrate the problem here (with
at least GetNextBufferInternal(), if not also IsSeekPending()). WDYT?

[landell, 2015/05/06 08:59:53]

I agree. That is how I wanted to do it but I went for the less intrusive change
since I was unsure if this check could mess things up in the seeking case. I'll
make the change. 
I'll see if I can come up with a unit test that demonstrates this. Thanks for
the input.

[landell, 2015/05/06 10:46:53]

Done.

       return kEndOfStream;
     DVLOG(3) << __FUNCTION__ << " " << GetStreamTypeName()
              << ": returning kNeedBuffer "
              << (selected_range_ ? "(selected range has no next buffer)"
                                  : "(no selected range)");
     return kNeedBuffer;
   }
 
   if (selected_range_->GetNextConfigId() != current_config_index_) {
     config_change_pending_ = true;
@@ skipping 462 matching lines @@
     return false;
 
   DCHECK_NE(have_splice_buffers, have_preroll_buffer);
   splice_buffers_index_ = 0;
   pending_buffer_.swap(*out_buffer);
   pending_buffers_complete_ = false;
   return true;
 }
 
 }  // namespace media