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 146 matching lines @@
 
   return false;
 }
 
 AccessUnitQueue::Info AccessUnitQueue::GetInfo() const {
   // Media thread, Decoder thread
 
   Info info;
   base::AutoLock lock(lock_);
 
-  info.length = GetUnconsumedAccessUnitLength();
+  GetUnconsumedAccessUnitLength(&info.length, &info.data_length);
+
   info.has_eos = has_eos_;
   info.front_unit = nullptr;
   info.configs = nullptr;
 
   if (info.length > 0) {
     DCHECK(current_chunk_ != chunks_.end());
     DCHECK(index_in_chunk_ < (*current_chunk_)->access_units.size());
     info.front_unit = &(*current_chunk_)->access_units[index_in_chunk_];
 
     if (info.front_unit->status == DemuxerStream::kConfigChanged) {
       DCHECK((*current_chunk_)->demuxer_configs.size() == 1);
       info.configs = &(*current_chunk_)->demuxer_configs[0];
     }
   }
   return info;
 }
 
 void AccessUnitQueue::SetHistorySizeForTesting(size_t history_chunks_amount) {
   history_chunks_amount_ = history_chunks_amount;
 }
 
-int AccessUnitQueue::GetUnconsumedAccessUnitLength() const {
-  int result = 0;
+void AccessUnitQueue::GetUnconsumedAccessUnitLength(int* total_length,

[liberato (no reviews please), 2015/08/28 15:21:42]

it looks like one could do this accounting in push_back and advance and flush,
rather than iterating here, for a factor of chunks_.size() improvement.  how
many items are in an AccessQueue in the worst case?

i suspect that it would have to be a fairly large number before the added
complexity is worth it.

[Tima Vaisburd, 2015/08/28 18:31:09]

Currently the number of chunks in the normal run is 2, it matches the two-chunk
situation we have in the MediaSourcePlayer. Maybe we can have 3 sometimes.

+                                                    int* data_length) const {
+  *total_length = *data_length = 0;
+
   DataChunkQueue::const_iterator chunk;
-  for (chunk = current_chunk_; chunk != chunks_.end(); ++chunk)
-    result += (*chunk)->access_units.size();
+  for (chunk = current_chunk_; chunk != chunks_.end(); ++chunk) {
+    size_t chunk_size = (*chunk)->access_units.size();
+    *total_length += chunk_size;
+    *data_length += chunk_size;
 
-  result -= index_in_chunk_;
-  return result;
+    // Do not count configuration changes for |data_length|.
+    if (!(*chunk)->demuxer_configs.empty()) {
+      DCHECK((*chunk)->demuxer_configs.size() == 1);
+      --(*data_length);
+    }
+  }
+
+  *total_length -= index_in_chunk_;
+  *data_length -= index_in_chunk_;
 }
 
 }  // namespace media