| Index: media/filters/ffmpeg_demuxer.h
|
| diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
|
| index def9d2a45d987fd8b9613eff6c895dc25322e043..09bffdaf9ee68f60e24df1d7900a8d64ece510b4 100644
|
| --- a/media/filters/ffmpeg_demuxer.h
|
| +++ b/media/filters/ffmpeg_demuxer.h
|
| @@ -38,6 +38,7 @@
|
| #include "media/base/decoder_buffer.h"
|
| #include "media/base/decoder_buffer_queue.h"
|
| #include "media/base/demuxer.h"
|
| +#include "media/base/media_tracks.h"
|
| #include "media/base/pipeline_status.h"
|
| #include "media/base/text_track_config.h"
|
| #include "media/base/video_decoder_config.h"
|
| @@ -223,6 +224,15 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
|
| // timeline.
|
| base::TimeDelta start_time() const { return start_time_; }
|
|
|
| + // Notifies the demuxer that track ids has been assigned to a media tracks.
|
| + void OnTrackIdsAssigned(const MediaTracks& tracks,
|
| + const std::vector<unsigned>& track_ids) override;
|
| +
|
| + // Finds a DemuxerStream corresponding to the given blink |track_id|. Note
|
| + // that the input track id is blink track id and not bytestream track id.
|
| + const DemuxerStream* GetDemuxerStreamByTrackId(
|
| + unsigned track_id) const override;
|
| +
|
| private:
|
| // To allow tests access to privates.
|
| friend class FFmpegDemuxerTest;
|
| @@ -334,6 +344,8 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
|
|
|
| const MediaTracksUpdatedCB media_tracks_updated_cb_;
|
|
|
| + MediaTracks::TrackIdToDemuxStreamMap track_id_to_demux_stream_;
|
| +
|
| // NOTE: Weak pointers must be invalidated before all other member variables.
|
| base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;
|
|
|
|
|