MediaResource refactoring to support multiple streams

chromecast/media/cma/test/frame_segmenter_for_test.cc

 // Copyright 2014 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 "chromecast/media/cma/test/frame_segmenter_for_test.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 305 matching lines @@
   ::media::FFmpegDemuxer demuxer(
       base::ThreadTaskRunnerHandle::Get(), &data_source,
       base::Bind(&OnEncryptedMediaInitData), base::Bind(&OnMediaTracksUpdated),
       new ::media::MediaLog());
   ::media::WaitableMessageLoopEvent init_event;
   demuxer.Initialize(&fake_demuxer_host,
                      init_event.GetPipelineStatusCB(),
                      false);
   init_event.RunAndWaitForStatus(::media::PIPELINE_OK);
 
-  ::media::DemuxerStream* stream = demuxer.GetStream(
-      audio ? ::media::DemuxerStream::AUDIO : ::media::DemuxerStream::VIDEO);
+  std::vector<::media::DemuxerStream*> streams = demuxer.GetStreams();
+  ::media::DemuxerStream* stream = nullptr;
+  for (const auto& s : streams) {
+    if (audio && s->type() == ::media::DemuxerStream::AUDIO) {

[tguilbert, 2017/01/24 23:24:40]

NIT: Can you remove one of the ifs, and use

::media::DemuxerStream::Type target_type = audio ? ::media::DemuxerStream::AUDIO
: ::media::DemuxerStream::VIDEO
[...]
if(s->type() == target_type)

[servolk, 2017/01/25 00:57:32]

Done.

+      stream = s;
+      break;
+    }
+    if (!audio && s->type() == ::media::DemuxerStream::VIDEO) {
+      stream = s;
+      break;
+    }
+  }
   CHECK(stream);
 
   DemuxResult demux_result;
   if (audio) {
     demux_result.audio_config = stream->audio_decoder_config();
   } else {
     demux_result.video_config = stream->video_decoder_config();
   }
 
   bool end_of_stream = false;
   while (!end_of_stream) {
     base::RunLoop run_loop;
     stream->Read(base::Bind(&OnNewBuffer,
                             base::Unretained(&demux_result.frames),
                             run_loop.QuitClosure()));
     run_loop.Run();
     CHECK(!demux_result.frames.empty());
     end_of_stream = demux_result.frames.back()->end_of_stream();
   }
 
   demuxer.Stop();
   return demux_result;
 }
 
 }  // namespace media
 }  // namespace chromecast