MediaResource refactoring to support multiple streams

chromecast/media/cma/test/frame_segmenter_for_test.cc

Index: chromecast/media/cma/test/frame_segmenter_for_test.cc
diff --git a/chromecast/media/cma/test/frame_segmenter_for_test.cc b/chromecast/media/cma/test/frame_segmenter_for_test.cc
index 5d9406ec01950def579fbb77597fd7403ae85c24..45583db015e3529e0c7cc1221e5fc7a345c12710 100644
--- a/chromecast/media/cma/test/frame_segmenter_for_test.cc
+++ b/chromecast/media/cma/test/frame_segmenter_for_test.cc
@@ -323,8 +323,18 @@ DemuxResult FFmpegDemuxForTest(const base::FilePath& filepath,
                      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;