Pass MSE media track info from ChunkDemuxer to blink::SourceBuffer

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

 /*
  * 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 33 matching lines @@
 namespace blink {
 
 class DOMArrayBuffer;
 class DOMArrayBufferView;
 class ExceptionState;
 class FileReaderLoader;
 class GenericEventQueue;
 class MediaSource;
 class Stream;
 class TimeRanges;
+class TrackBase;
 class WebSourceBuffer;
 
 class SourceBuffer final
     : public RefCountedGarbageCollectedEventTargetWithInlineData<SourceBuffer>
     , public ActiveDOMObject
     , public FileReaderLoaderClient
     , public WebSourceBufferClient {
     REFCOUNTED_GARBAGE_COLLECTED_EVENT_TARGET(SourceBuffer);
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(SourceBuffer);
     DEFINE_WRAPPERTYPEINFO();
@@ skipping 31 matching lines @@
     bool hasPendingActivity() const override;
     void suspend() override;
     void resume() override;
     void stop() override;
 
     // EventTarget interface
     ExecutionContext* getExecutionContext() const override;
     const AtomicString& interfaceName() const override;
 
     // WebSourceBufferClient interface
-    void initializationSegmentReceived() override;
+    WebMediaPlayer::TrackId createMediaTrack(WebMediaPlayer::TrackType, WebString, WebString, WebString, WebString) override;

[philipj_slow, 2016/03/24 05:56:00]

The arguments should be named when not redundant with the type.

[servolk, 2016/03/29 01:26:33]

Done.

+    void initializationSegmentReceived(const WebVector<WebMediaPlayer::TrackId>&) override;
 
     // Oilpan: eagerly release owned m_webSourceBuffer
     EAGERLY_FINALIZE();
     DECLARE_VIRTUAL_TRACE();
 
 private:
     SourceBuffer(PassOwnPtr<WebSourceBuffer>, MediaSource*, GenericEventQueue*);
 
     bool isRemoved() const;
     void scheduleEvent(const AtomicString& eventName);
@@ skipping 15 matching lines @@
     void didStartLoading() override;
     void didReceiveDataForClient(const char* data, unsigned dataLength) override;
     void didFinishLoading() override;
     void didFail(FileError::ErrorCode) override;
 
     OwnPtr<WebSourceBuffer> m_webSourceBuffer;
     Member<MediaSource> m_source;
     Member<TrackDefaultList> m_trackDefaults;
     RawPtrWillBeMember<GenericEventQueue> m_asyncEventQueue;
 
+    // The |m_pendingTracks| collection holds media track objects returned by
+    // createMediaTrack method but not yet reported to the
+    // initializationSegmentReceived. This is necessary to prevent media track
+    // objects from being GC-collected before the init segment algorithm is run.
+    HeapVector<Member<TrackBase>> m_pendingTracks;
+
+    HeapVector<WebMediaPlayer::TrackId> m_audioTrackIds;

[philipj_slow, 2016/03/24 05:56:00]

I think these can be plain Vector<>, WebMediaPlayer::TrackId is just a typedef
for unsigned int.

[servolk, 2016/03/29 01:26:33]

Actually, I've just removed those in the latest patchset.

+    HeapVector<WebMediaPlayer::TrackId> m_videoTrackIds;
+    // TODO(servolk): Add track id collection for text tracks as well.
+
     AtomicString m_mode;
     bool m_updating;
     double m_timestampOffset;
     double m_appendWindowStart;
     double m_appendWindowEnd;
     bool m_firstInitializationSegmentReceived;
 
     Vector<unsigned char> m_pendingAppendData;
     size_t m_pendingAppendDataOffset;
     Member<AsyncMethodRunner<SourceBuffer>> m_appendBufferAsyncPartRunner;
 
     double m_pendingRemoveStart;
     double m_pendingRemoveEnd;
     Member<AsyncMethodRunner<SourceBuffer>> m_removeAsyncPartRunner;
 
     bool m_streamMaxSizeValid;
     unsigned long long m_streamMaxSize;
     Member<AsyncMethodRunner<SourceBuffer>> m_appendStreamAsyncPartRunner;
     Member<Stream> m_stream;
     OwnPtr<FileReaderLoader> m_loader;
 };
 
 } // namespace blink
 
 #endif // SourceBuffer_h