MediaCodecPlayer implementation (stage 5 - reconfiguration)

media/base/android/access_unit_queue.h

 // 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.
 
 #ifndef MEDIA_BASE_ANDROID_ACCESS_UNIT_QUEUE_H_
 #define MEDIA_BASE_ANDROID_ACCESS_UNIT_QUEUE_H_
 
 #include <list>
 
 #include "base/macros.h"
@@ skipping 22 matching lines @@
     const AccessUnit* front_unit;
 
     // Configs for the front unit if it is |kConfigChanged|, null otherwise.
     // The same validity rule applies: this pointer is only valid till the next
     // Advance() or Flush() call, and |configs| is owned by the queue itself.
     const DemuxerConfigs* configs;
 
     // Number of access units in the queue.
     int length;
 
+    // Number of access units in the queue excluding config units.
+    int data_length;
+
     // Whether End Of Stream has been added to the queue. Cleared by Flush().
     bool has_eos;
 
     Info() : front_unit(nullptr), configs(nullptr), length(0), has_eos(false) {}
   };
 
   AccessUnitQueue();
   ~AccessUnitQueue();
 
   // Appends the incoming data to the queue.
@@ skipping 15 matching lines @@
   // Returns the information about the queue.
   // The result is invalidated by the following Advance() or Flush call.
   // There must be only one |Info| consumer at a time.
   Info GetInfo() const;
 
   // For unit tests only. These methods are not thread safe.
   size_t NumChunksForTesting() const { return chunks_.size(); }
   void SetHistorySizeForTesting(size_t number_of_history_chunks);
 
  private:
-  // Returns the amount of access units between the current one and the end,
-  // incuding current. Logically these are units that have not been consumed.
-  int GetUnconsumedAccessUnitLength() const;
+  // Returns the total number of access (total_length) and the number of units

[qinmin, 2015/08/27 19:38:42]

s/access/access units/

[Tima Vaisburd, 2015/08/27 20:39:47]

Done.

+  // excluding configiration change requests (data_length). The number is
+  // calculated between the current one and the end, incuding the current.
+  // Logically these are units that have not been consumed.
+  void GetUnconsumedAccessUnitLength(int* total_length, int* data_length) const;
 
   // The queue of data chunks. It owns the chunks.
   typedef std::list<DemuxerData*> DataChunkQueue;
   DataChunkQueue chunks_;
 
   // The chunk that contains the current access unit.
   DataChunkQueue::iterator current_chunk_;
 
   // Index of the current access unit within the current chunk.
   size_t index_in_chunk_;
 
   // Amount of chunks before the |current_chunk_| that's kept for history.
   size_t history_chunks_amount_;
 
   // Indicates that a unit with End Of Stream flag has been appended.
   bool has_eos_;
 
   // The lock protects all fields together.
   mutable base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(AccessUnitQueue);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_ACCESS_UNIT_QUEUE_H_