Generate and assign media track ids in demuxers.

media/formats/mp4/mp4_stream_parser.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 "media/formats/mp4/mp4_stream_parser.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <memory>
@@ skipping 300 matching lines @@
         LOG(ERROR) << "Unsupported sample size.";
         return false;
       }
 
       is_audio_track_encrypted_ = entry.sinf.info.track_encryption.is_encrypted;
       DVLOG(1) << "is_audio_track_encrypted_: " << is_audio_track_encrypted_;
       audio_config.Initialize(
           codec, sample_format, channel_layout, sample_per_second, extra_data,
           is_audio_track_encrypted_ ? AesCtrEncryptionScheme() : Unencrypted(),
           base::TimeDelta(), 0);
+      if (!audio_config.IsValidConfig()) {
+        MEDIA_LOG(ERROR, media_log_) << "Invalid audio decoder config: "
+                                     << audio_config.AsHumanReadableString();
+        return false;
+      }
       has_audio_ = true;
       audio_track_id_ = track->header.track_id;
       media_tracks->AddAudioTrack(audio_config, audio_track_id_, "main",
                                   track->media.handler.name,
                                   track->media.header.language());
       continue;
     }
 
     if (track->media.handler.type == kVideo) {
       detected_video_track_count++;
@@ skipping 31 matching lines @@
 
       is_video_track_encrypted_ = entry.sinf.info.track_encryption.is_encrypted;
       DVLOG(1) << "is_video_track_encrypted_: " << is_video_track_encrypted_;
       video_config.Initialize(
           entry.video_codec, entry.video_codec_profile, PIXEL_FORMAT_YV12,
           COLOR_SPACE_HD_REC709, coded_size, visible_rect, natural_size,
           // No decoder-specific buffer needed for AVC;
           // SPS/PPS are embedded in the video stream
           EmptyExtraData(),
           is_video_track_encrypted_ ? AesCtrEncryptionScheme() : Unencrypted());
+      if (!video_config.IsValidConfig()) {
+        MEDIA_LOG(ERROR, media_log_) << "Invalid video decoder config: "
+                                     << video_config.AsHumanReadableString();
+        return false;
+      }
       has_video_ = true;
       video_track_id_ = track->header.track_id;
       media_tracks->AddVideoTrack(video_config, video_track_id_, "main",
                                   track->media.handler.name,
                                   track->media.header.language());
       continue;
     }
 
     // TODO(wolenetz): Investigate support in MSE and Chrome MSE for CEA 608/708
     // embedded caption data in video track. At time of init segment parsing, we
@@ skipping 316 matching lines @@
       runs.AdvanceSample();
     }
     runs.AdvanceRun();
   }
 
   return true;
 }
 
 }  // namespace mp4
 }  // namespace media