Fix possible buffer emission during an abort.

media/filters/pipeline_integration_test.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/pipeline_integration_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
@@ skipping 304 matching lines @@
 
   scoped_ptr<Demuxer> GetDemuxer() { return owned_chunk_demuxer_.Pass(); }
 
   void set_need_key_cb(const Demuxer::NeedKeyCB& need_key_cb) {
     need_key_cb_ = need_key_cb;
   }
 
   void Seek(base::TimeDelta seek_time, int new_position, int seek_append_size) {
     chunk_demuxer_->StartWaitingForSeek(seek_time);
 
-    chunk_demuxer_->Abort(kSourceId);
+    // TODO(wolenetz): Test timestamp offset updating once "sequence" append
+    // mode processing is implemented. See http://crbug.com/249422.
+    base::TimeDelta timestamp_offset;
+    chunk_demuxer_->Abort(
+        kSourceId,
+        base::TimeDelta(), kInfiniteDuration(), &timestamp_offset);

[wolenetz, 2014/05/06 00:58:11]

nit: Let's use &last_timestamp_offset_ here and drop the local
|timestamp_offset|. Abort during an mpeg2ts seek could emit frames that need
processing, and such processing uses this timestamp offset as input even now
(though I don't see any such mpeg2ts unit test seeking at the moment).

[damienv1, 2014/05/06 01:21:44]

Done.

+    last_timestamp_offset_ = timestamp_offset;
 
     DCHECK_GE(new_position, 0);
     DCHECK_LT(new_position, file_data_->data_size());
     current_position_ = new_position;
 
     AppendData(seek_append_size);
   }
 
   void AppendData(int size) {
     DCHECK(chunk_demuxer_);
     DCHECK_LT(current_position_, file_data_->data_size());
     DCHECK_LE(current_position_ + size, file_data_->data_size());
 
     // TODO(wolenetz): Test timestamp offset updating once "sequence" append
     // mode processing is implemented. See http://crbug.com/249422.
     base::TimeDelta timestamp_offset;
     chunk_demuxer_->AppendData(
         kSourceId, file_data_->data() + current_position_, size,
         base::TimeDelta(), kInfiniteDuration(), &timestamp_offset);

[wolenetz, 2014/05/06 00:58:11]

nit: ditto. Similarly, there are not two AppendData() in a row currently that
use a non-zero timestamp offset (there is AppendData followed by AppendAtTime in
a couple test cases), but let's not confuse future test writers :)

[damienv1, 2014/05/06 01:21:44]

Done.

     current_position_ += size;
     last_timestamp_offset_ = timestamp_offset;
   }
 
   void AppendAtTime(base::TimeDelta timestamp_offset,
                     const uint8* pData,
                     int size) {
     CHECK(!chunk_demuxer_->IsParsingMediaSegment(kSourceId));
     chunk_demuxer_->AppendData(kSourceId, pData, size,
                                base::TimeDelta(), kInfiniteDuration(),
@@ skipping 919 matching lines @@
   Play();
   ASSERT_TRUE(WaitUntilOnEnded());
 }
 
 // TODO(wolenetz): Enable MSE testing of new frame processor based on this flag,
 // once the new processor has landed. See http://crbug.com/249422.
 INSTANTIATE_TEST_CASE_P(LegacyFrameProcessor, PipelineIntegrationTest,
                         Values(true));
 
 }  // namespace media