Use trackInfo.id instead of bytestream id for blink tracks

third_party/WebKit/Source/modules/mediasource/SourceBuffer.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 728 matching lines @@
             // 5.2.4 Let audio label be a label specified in the initialization segment for this track or an empty string if no label info is present.
             WebString label = trackInfo.label;
             // 5.3.5 If audio label equals an empty string, then run the default track label algorithm with byteStreamTrackID set to audio byte stream track ID and
             // type set to "audio" and assign the value returned by the algorithm to audio label.
             if (label.isEmpty())
                 label = defaultTrackLabel(TrackDefault::audioKeyword(), byteStreamTrackID);
             // 5.2.6 Let audio kinds be an array of kind strings specified in the initialization segment for this track or an empty array if no kind information is provided.
             const auto& kind = trackInfo.kind;
             // 5.2.7 TODO(servolk): Implement track kind processing.
             // 5.2.8.2 Let new audio track be a new AudioTrack object.
-            AudioTrack* audioTrack = AudioTrack::create(byteStreamTrackID, kind, label, language, false);
+            AudioTrack* audioTrack = AudioTrack::create(trackInfo.id, kind, label, language, false);
             SourceBufferTrackBaseSupplement::setSourceBuffer(*audioTrack, this);
             // 5.2.8.7 If audioTracks.length equals 0, then run the following steps:
             if (audioTracks().length() == 0) {
                 // 5.2.8.7.1 Set the enabled property on new audio track to true.
                 audioTrack->setEnabled(true);
                 // 5.2.8.7.2 Set active track flag to true.
                 m_activeTrack = true;
             }
             // 5.2.8.8 Add new audio track to the audioTracks attribute on this SourceBuffer object.
             // 5.2.8.9 Queue a task to fire a trusted event named addtrack, that does not bubble and is not cancelable, and that uses the TrackEvent interface, at the AudioTrackList object referenced by the audioTracks attribute on this SourceBuffer object.
@@ skipping 16 matching lines @@
             // 5.3.4 Let video label be a label specified in the initialization segment for this track or an empty string if no label info is present.
             WebString label = trackInfo.label;
             // 5.3.5 If video label equals an empty string, then run the default track label algorithm with byteStreamTrackID set to video byte stream track ID and
             // type set to "video" and assign the value returned by the algorithm to video label.
             if (label.isEmpty())
                 label = defaultTrackLabel(TrackDefault::videoKeyword(), byteStreamTrackID);
             // 5.3.6 Let video kinds be an array of kind strings specified in the initialization segment for this track or an empty array if no kind information is provided.
             const auto& kind = trackInfo.kind;
             // 5.3.7 TODO(servolk): Implement track kind processing.
             // 5.3.8.2 Let new video track be a new VideoTrack object.
-            VideoTrack* videoTrack = VideoTrack::create(byteStreamTrackID, kind, label, language, false);
+            VideoTrack* videoTrack = VideoTrack::create(trackInfo.id, kind, label, language, false);
             SourceBufferTrackBaseSupplement::setSourceBuffer(*videoTrack, this);
             // 5.3.8.7 If videoTracks.length equals 0, then run the following steps:
             if (videoTracks().length() == 0) {
                 // 5.3.8.7.1 Set the selected property on new audio track to true.
                 videoTrack->setSelected(true);
                 // 5.3.8.7.2 Set active track flag to true.
                 m_activeTrack = true;
             }
             // 5.3.8.8 Add new video track to the videoTracks attribute on this SourceBuffer object.
             // 5.3.8.9 Queue a task to fire a trusted event named addtrack, that does not bubble and is not cancelable, and that uses the TrackEvent interface, at the VideoTrackList object referenced by the videoTracks attribute on this SourceBuffer object.
@@ skipping 418 matching lines @@
     visitor->trace(m_removeAsyncPartRunner);
     visitor->trace(m_appendStreamAsyncPartRunner);
     visitor->trace(m_stream);
     visitor->trace(m_audioTracks);
     visitor->trace(m_videoTracks);
     EventTargetWithInlineData::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink