MediaCodecPlayer implementation (stage 5 - reconfiguration)

media/base/android/test_data_factory.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/test_data_factory.h"
 
+#include <iterator>
+
 #include "base/strings/stringprintf.h"
 #include "media/base/android/demuxer_stream_player_params.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/test_data_util.h"
 
 namespace media {
 
 DemuxerConfigs TestDataFactory::CreateAudioConfigs(AudioCodec audio_codec,
                                                    base::TimeDelta duration) {
   DemuxerConfigs configs;
@@ skipping 36 matching lines @@
   configs.duration = duration;
 
   return configs;
 }
 
 TestDataFactory::TestDataFactory(const char* file_name_template,
                                  base::TimeDelta duration,
                                  base::TimeDelta frame_period)
     : duration_(duration),
       frame_period_(frame_period),
+      total_chunks_(0),
       starvation_mode_(false),
       eos_reached_(false) {
   LoadPackets(file_name_template);
 }
 
 TestDataFactory::~TestDataFactory() {}
 
 bool TestDataFactory::CreateChunk(DemuxerData* chunk, base::TimeDelta* delay) {
   DCHECK(chunk);
   DCHECK(delay);
 
   if (eos_reached_)
     return false;
 
   *delay = base::TimeDelta();
 
+  if (!total_chunks_ &&
+      HasReconfigForInterval(base::TimeDelta::FromMilliseconds(-1),
+                             base::TimeDelta())) {
+    // Since the configs AU has to come last in the chunk the initial configs
+    // preceeding any other data has to be the only unit in the chunk.
+    AddConfiguration(chunk);
+    ++total_chunks_;
+    return true;
+  }
+
   for (int i = 0; i < 4; ++i) {
+    // Put ConfigChanged at the end of the chunk if there is a request
+    // for the chunk's timeframe.
+    if (i == 3 && HasReconfigForInterval(chunk->access_units[0].timestamp,

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

move the if statement outside the loop
just do:

for(int i=0; i <3; ++i) {
  .....
}
if (....)
  AddConfiguration(chunk);

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

Done.

+                                         regular_pts_)) {
+      AddConfiguration(chunk);
+      break;
+    }
+
     chunk->access_units.push_back(AccessUnit());
     AccessUnit& unit = chunk->access_units.back();
     unit.status = DemuxerStream::kOk;
 
     unit.timestamp = regular_pts_;
     regular_pts_ += frame_period_;
 
     if (unit.timestamp > duration_) {
       if (starvation_mode_)
         return false;
 
       unit.is_end_of_stream = true;
       eos_reached_ = true;
       break;  // EOS units have no data.
     }
 
     unit.data = packet_[i];
 
     // Allow for modification by subclasses.
     ModifyAccessUnit(i, &unit);
 
     // Maintain last PTS. ModifyAccessUnit() can modify unit's PTS.
     if (last_pts_ < unit.timestamp)
       last_pts_ = unit.timestamp;
   }
 
+  ++total_chunks_;
   return true;
 }
 
 void TestDataFactory::SeekTo(const base::TimeDelta& seek_time) {
   regular_pts_ = seek_time;
   last_pts_ = base::TimeDelta();
   eos_reached_ = false;
 }
 
+void TestDataFactory::RequestInitialConfigs() {
+  reconfigs_.insert(base::TimeDelta::FromMilliseconds(-1));
+}
+
+void TestDataFactory::RequestConfigChange(base::TimeDelta config_position) {
+  reconfigs_.insert(config_position);
+}
+
 void TestDataFactory::LoadPackets(const char* file_name_template) {
   for (int i = 0; i < 4; ++i) {
     scoped_refptr<DecoderBuffer> buffer =
         ReadTestDataFile(base::StringPrintf(file_name_template, i));
     packet_[i] = std::vector<uint8>(buffer->data(),
                                     buffer->data() + buffer->data_size());
   }
 }
 
+bool TestDataFactory::HasReconfigForInterval(base::TimeDelta left,
+                                             base::TimeDelta right) const {
+  // |first| points to an element greater or equal to |left|.
+  PTSSet::const_iterator first = reconfigs_.lower_bound(left);
+
+  // |last| points to an element greater or equal to |right|.
+  PTSSet::const_iterator last = reconfigs_.lower_bound(right);
+
+  return std::distance(first, last);
+}
+
+void TestDataFactory::AddConfiguration(DemuxerData* chunk) {
+  DCHECK(chunk);
+  chunk->access_units.push_back(AccessUnit());
+  AccessUnit& unit = chunk->access_units.back();
+  unit.status = DemuxerStream::kConfigChanged;
+
+  DCHECK(chunk->demuxer_configs.empty());
+  chunk->demuxer_configs.push_back(GetConfigs());
+}
+
 }  // namespace media