Index: media/base/android/access_unit_queue.cc |
diff --git a/media/base/android/access_unit_queue.cc b/media/base/android/access_unit_queue.cc |
index 38d45f5468038bf3f6dc263da214edd40c3d402b..30e13fd8120edc346885979caa2064bd902211fc 100644 |
--- a/media/base/android/access_unit_queue.cc |
+++ b/media/base/android/access_unit_queue.cc |
@@ -189,9 +189,16 @@ void AccessUnitQueue::SetHistorySizeForTesting(size_t 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 t
Tima Vaisburd
2015/08/25 22:57:30
Yes, it's a bug. I added another length, |data_len
|
+ --result; |
+ } |
+ } |
+ |
result -= index_in_chunk_; |
return result; |
} |