Generate and assign media track ids in demuxers.

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 505 matching lines @@
     // 4.3 For each AudioTrack object in the SourceBuffer audioTracks list, run the following steps:
     while (audioTracks().length() > 0) {
         AudioTrack* audioTrack = audioTracks().anonymousIndexedGetter(0);
         // 4.3.1 Set the sourceBuffer attribute on the AudioTrack object to null.
         SourceBufferTrackBaseSupplement::setSourceBuffer(*audioTrack, nullptr);
         // 4.3.2 If the enabled attribute on the AudioTrack object is true, then set the removed enabled audio track flag to true.
         if (audioTrack->enabled())
             removedEnabledAudioTrack = true;
         // 4.3.3 Remove the AudioTrack object from the HTMLMediaElement audioTracks list.
         // 4.3.4 Queue a task to fire a trusted event named removetrack, that does not bubble and is not cancelable, and that uses the TrackEvent interface, at the HTMLMediaElement audioTracks list.
-        mediaElement->audioTracks().remove(audioTrack->trackId());
+        mediaElement->audioTracks().remove(audioTrack->id());
         // 4.3.5 Remove the AudioTrack object from the SourceBuffer audioTracks list.
         // 4.3.6 Queue a task to fire a trusted event named removetrack, that does not bubble and is not cancelable, and that uses the TrackEvent interface, at the SourceBuffer audioTracks list.
-        audioTracks().remove(audioTrack->trackId());
+        audioTracks().remove(audioTrack->id());
     }
     // 4.4 If the removed enabled audio track flag equals true, then queue a task to fire a simple event named change at the HTMLMediaElement audioTracks list.
     if (removedEnabledAudioTrack) {
         Event* event = Event::create(EventTypeNames::change);
         event->setTarget(&mediaElement->audioTracks());
         mediaElement->scheduleEvent(event);
     }
 
     // 5. Let SourceBuffer videoTracks list equal the VideoTrackList object returned by sourceBuffer.videoTracks.
     // 6. If the SourceBuffer videoTracks list is not empty, then run the following steps:
     // 6.1 Let HTMLMediaElement videoTracks list equal the VideoTrackList object returned by the videoTracks attribute on the HTMLMediaElement.
     // 6.2 Let the removed selected video track flag equal false.
     bool removedSelectedVideoTrack = false;
     // 6.3 For each VideoTrack object in the SourceBuffer videoTracks list, run the following steps:
     while (videoTracks().length() > 0) {
         VideoTrack* videoTrack = videoTracks().anonymousIndexedGetter(0);
         // 6.3.1 Set the sourceBuffer attribute on the VideoTrack object to null.
         SourceBufferTrackBaseSupplement::setSourceBuffer(*videoTrack, nullptr);
         // 6.3.2 If the selected attribute on the VideoTrack object is true, then set the removed selected video track flag to true.
         if (videoTrack->selected())
             removedSelectedVideoTrack = true;
         // 6.3.3 Remove the VideoTrack object from the HTMLMediaElement videoTracks list.
         // 6.3.4 Queue a task to fire a trusted event named removetrack, that does not bubble and is not cancelable, and that uses the TrackEvent interface, at the HTMLMediaElement videoTracks list.
-        mediaElement->videoTracks().remove(videoTrack->trackId());
+        mediaElement->videoTracks().remove(videoTrack->id());
         // 6.3.5 Remove the VideoTrack object from the SourceBuffer videoTracks list.
         // 6.3.6 Queue a task to fire a trusted event named removetrack, that does not bubble and is not cancelable, and that uses the TrackEvent interface, at the SourceBuffer videoTracks list.
-        videoTracks().remove(videoTrack->trackId());
+        videoTracks().remove(videoTrack->id());
     }
     // 6.4 If the removed selected video track flag equals true, then queue a task to fire a simple event named change at the HTMLMediaElement videoTracks list.
     if (removedSelectedVideoTrack) {
         Event* event = Event::create(EventTypeNames::change);
         event->setTarget(&mediaElement->videoTracks());
         mediaElement->scheduleEvent(event);
     }
 
     // 7-8. TODO(servolk): Remove text tracks once SourceBuffer has text tracks.
 }
@@ skipping 16 matching lines @@
     DCHECK(m_source);
     DCHECK(m_source->mediaElement());
     DCHECK(m_updating);
 
     // TODO(servolk): Implement proper 'initialization segment received' algorithm according to MSE spec:
     // https://w3c.github.io/media-source/#sourcebuffer-init-segment-received
     WebVector<WebMediaPlayer::TrackId> result(newTracks.size());
     unsigned resultIdx = 0;
     for (const auto& trackInfo : newTracks) {
         if (!RuntimeEnabledFeatures::audioVideoTracksEnabled()) {
-            static WebMediaPlayer::TrackId nextTrackId = 0;
-            result[resultIdx++] = ++nextTrackId;
+            static unsigned nextTrackId = 0;
+            StringBuilder stringBuilder;
+            stringBuilder.appendNumber(++nextTrackId);
+            result[resultIdx++] = stringBuilder.toString();
             continue;
         }
 
         const TrackBase* trackBase = nullptr;
         if (trackInfo.trackType == WebMediaPlayer::AudioTrack) {
             AudioTrack* audioTrack = nullptr;
             if (!m_firstInitializationSegmentReceived) {
-                audioTrack = AudioTrack::create(trackInfo.byteStreamTrackId, trackInfo.kind, trackInfo.label, trackInfo.language, false);
+                audioTrack = AudioTrack::create(trackInfo.id, trackInfo.kind, trackInfo.label, trackInfo.language, false);
                 SourceBufferTrackBaseSupplement::setSourceBuffer(*audioTrack, this);
                 audioTracks().add(audioTrack);
                 m_source->mediaElement()->audioTracks().add(audioTrack);
             } else {
-                audioTrack = findExistingTrackById(audioTracks(), trackInfo.byteStreamTrackId);
+                audioTrack = findExistingTrackById(audioTracks(), trackInfo.id);
                 DCHECK(audioTrack);
             }
             trackBase = audioTrack;
-            result[resultIdx++] = audioTrack->trackId();
+            result[resultIdx++] = audioTrack->id();
         } else if (trackInfo.trackType == WebMediaPlayer::VideoTrack) {
             VideoTrack* videoTrack = nullptr;
             if (!m_firstInitializationSegmentReceived) {
-                videoTrack = VideoTrack::create(trackInfo.byteStreamTrackId, trackInfo.kind, trackInfo.label, trackInfo.language, false);
+                videoTrack = VideoTrack::create(trackInfo.id, trackInfo.kind, trackInfo.label, trackInfo.language, false);
                 SourceBufferTrackBaseSupplement::setSourceBuffer(*videoTrack, this);
                 videoTracks().add(videoTrack);
                 m_source->mediaElement()->videoTracks().add(videoTrack);
             } else {
-                videoTrack = findExistingTrackById(videoTracks(), trackInfo.byteStreamTrackId);
+                videoTrack = findExistingTrackById(videoTracks(), trackInfo.id);
                 DCHECK(videoTrack);
             }
             trackBase = videoTrack;
-            result[resultIdx++] = videoTrack->trackId();
+            result[resultIdx++] = videoTrack->id();
         } else {
             NOTREACHED();
         }
         (void)trackBase;
 #if !LOG_DISABLED
         const char* logActionStr = m_firstInitializationSegmentReceived ? "using existing" : "added";
         const char* logTrackTypeStr = (trackInfo.trackType == WebMediaPlayer::AudioTrack) ? "audio" : "video";
         SBLOG << __FUNCTION__ << "(" << this << ") " << logActionStr << " "
-            << logTrackTypeStr << " Track " << trackBase << "trackId=" << trackBase->trackId() << " id="
-            << trackBase->id() << " label=" << trackBase->label() << " lang=" << trackBase->language();
+            << logTrackTypeStr << " Track " << trackBase << " id=" << String(trackBase->id())
+            << " label=" << trackBase->label() << " lang=" << trackBase->language();
 #endif
     }
 
     if (!m_firstInitializationSegmentReceived) {
         // 5. If active track flag equals true, then run the following steps:
         // 5.1. Add this SourceBuffer to activeSourceBuffers.
         // 5.2. Queue a task to fire a simple event named addsourcebuffer at
         // activesourcebuffers.
         m_source->setSourceBufferActive(this);
 
@@ skipping 383 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