MediaCodecPlayer implementation (stage 5 - reconfiguration)

media/base/android/access_unit_queue.cc

 // Copyright 2015 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/android/access_unit_queue.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "media/base/demuxer_stream.h"
 
@@ skipping 171 matching lines @@
   return info;
 }
 
 void AccessUnitQueue::SetHistorySizeForTesting(size_t history_chunks_amount) {
   history_chunks_amount_ = history_chunks_amount;
 }
 
 int AccessUnitQueue::GetUnconsumedAccessUnitLength() const {
   int result = 0;
   DataChunkQueue::const_iterator chunk;
-  for (chunk = current_chunk_; chunk != chunks_.end(); ++chunk)
+  for (chunk = current_chunk_; chunk != chunks_.end(); ++chunk) {
     result += (*chunk)->access_units.size();
 
+    // Do not count configuration changes.
+    if (!(*chunk)->demuxer_configs.empty()) {
+      DCHECK((*chunk)->demuxer_configs.size() == 1);

[qinmin, 2015/08/21 18:37:53]

doesn't this impacts GetInfo() call above?
so if the returned result is 0, getInfo() will not try initialize the
info.configs field.

[Tima Vaisburd, 2015/08/25 22:57:30]

Yes, it's a bug. I added another length, |data_length| to Info.

+      --result;
+    }
+  }
+
   result -= index_in_chunk_;
   return result;
 }
 
 }  // namespace media