Clear active splice flag after an explicit Reset().

media/filters/fake_demuxer_stream.cc

 // Copyright (c) 2013 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/fake_demuxer_stream.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 36 matching lines @@
 
 FakeDemuxerStream::~FakeDemuxerStream() {}
 
 void FakeDemuxerStream::Initialize() {
   DCHECK_EQ(-1, read_to_hold_);
   num_configs_left_ = num_configs_;
   num_buffers_left_in_current_config_ = num_buffers_in_one_config_;
   num_buffers_returned_ = 0;
   current_timestamp_ = base::TimeDelta::FromMilliseconds(kStartTimestampMs);
   duration_ = base::TimeDelta::FromMilliseconds(kDurationMs);
+  splice_timestamp_ = kNoTimestamp();
   next_coded_size_ = gfx::Size(kStartWidth, kStartHeight);
   next_read_num_ = 0;
 }
 
 void FakeDemuxerStream::Read(const ReadCB& read_cb) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(read_cb_.is_null());
 
   read_cb_ = BindToCurrentLoop(read_cb);
 
@@ skipping 106 matching lines @@
 
   // TODO(xhwang): Output out-of-order buffers if needed.
   if (is_encrypted_) {
     buffer->set_decrypt_config(scoped_ptr<DecryptConfig>(
         new DecryptConfig(std::string(kKeyId, kKeyId + arraysize(kKeyId)),
                           std::string(kIv, kIv + arraysize(kIv)),
                           std::vector<SubsampleEntry>())));
   }
   buffer->set_timestamp(current_timestamp_);
   buffer->set_duration(duration_);
+  buffer->set_splice_timestamp(splice_timestamp_);
   current_timestamp_ += duration_;
 
   num_buffers_left_in_current_config_--;
   if (num_buffers_left_in_current_config_ == 0)
     num_configs_left_--;
 
   num_buffers_returned_++;
   base::ResetAndReturn(&read_cb_).Run(kOk, buffer);
 }
 
 }  // namespace media