| Index: media/filters/ffmpeg_demuxer.h
|
| diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
|
| index 73aded71b40d19fd48765c24bcce1157b853f944..b89196d4a940866fe551a193ceb2aeea51550f51 100644
|
| --- a/media/filters/ffmpeg_demuxer.h
|
| +++ b/media/filters/ffmpeg_demuxer.h
|
| @@ -25,7 +25,6 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| -#include <map>
|
| #include <string>
|
| #include <utility>
|
| #include <vector>
|
| @@ -39,7 +38,6 @@
|
| #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"
|
| @@ -225,15 +223,6 @@ 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;
|
| @@ -345,8 +334,6 @@ 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_;
|
|
|
|
|