Allow MP4 parser to handle multiple audio and video tracks

media/formats/mp4/mp4_stream_parser.h

 // 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.
 
 #ifndef MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_
 #define MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 100 matching lines @@
   // The highest end offset in the current moof. This offset is
   // relative to |moof_head_|. This value is used to make sure we have collected
   // enough bytes to parse all samples and aux_info in the current moof.
   int64_t highest_end_offset_;
 
   std::unique_ptr<mp4::Movie> moov_;
   std::unique_ptr<mp4::TrackRunIterator> runs_;
 
   bool has_audio_;
   bool has_video_;
-  uint32_t audio_track_id_;
-  uint32_t video_track_id_;
+  std::set<uint32_t> audio_track_ids_;
+  std::set<uint32_t> video_track_ids_;
   // The object types allowed for audio tracks.
   std::set<int> audio_object_types_;
   bool has_sbr_;
-  bool is_audio_track_encrypted_;
-  bool is_video_track_encrypted_;
+  std::map<uint32_t, bool> is_track_encrypted_;
 
   // Tracks the number of MEDIA_LOGs for skipping top level boxes. Useful to
   // prevent log spam.
   int num_top_level_box_skipped_;
 
   DISALLOW_COPY_AND_ASSIGN(MP4StreamParser);
 };
 
 }  // namespace mp4
 }  // namespace media
 
 #endif  // MEDIA_FORMATS_MP4_MP4_STREAM_PARSER_H_