Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: media/base/media_url_demuxer.h

Issue 2718483003: Use base::Optional for selected video track. (Closed)
Patch Set: rebase Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/base/demuxer.h ('k') | media/base/media_url_demuxer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_BASE_MEDIA_URL_DEMUXER_H_ 5 #ifndef MEDIA_BASE_MEDIA_URL_DEMUXER_H_
6 #define MEDIA_BASE_MEDIA_URL_DEMUXER_H_ 6 #define MEDIA_BASE_MEDIA_URL_DEMUXER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 bool enable_text_tracks) override; 51 bool enable_text_tracks) override;
52 void StartWaitingForSeek(base::TimeDelta seek_time) override; 52 void StartWaitingForSeek(base::TimeDelta seek_time) override;
53 void CancelPendingSeek(base::TimeDelta seek_time) override; 53 void CancelPendingSeek(base::TimeDelta seek_time) override;
54 void Seek(base::TimeDelta time, const PipelineStatusCB& status_cb) override; 54 void Seek(base::TimeDelta time, const PipelineStatusCB& status_cb) override;
55 void Stop() override; 55 void Stop() override;
56 void AbortPendingReads() override; 56 void AbortPendingReads() override;
57 base::TimeDelta GetStartTime() const override; 57 base::TimeDelta GetStartTime() const override;
58 base::Time GetTimelineOffset() const override; 58 base::Time GetTimelineOffset() const override;
59 int64_t GetMemoryUsage() const override; 59 int64_t GetMemoryUsage() const override;
60 void OnEnabledAudioTracksChanged(const std::vector<MediaTrack::Id>& track_ids, 60 void OnEnabledAudioTracksChanged(const std::vector<MediaTrack::Id>& track_ids,
61 base::TimeDelta currTime) override; 61 base::TimeDelta curr_time) override;
62 void OnSelectedVideoTrackChanged(const std::vector<MediaTrack::Id>& track_ids, 62 void OnSelectedVideoTrackChanged(
63 base::TimeDelta currTime) override; 63 base::Optional<MediaTrack::Id> selected_track_id,
64 base::TimeDelta curr_time) override;
64 65
65 private: 66 private:
66 MediaUrlParams params_; 67 MediaUrlParams params_;
67 68
68 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 69 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
69 70
70 DISALLOW_COPY_AND_ASSIGN(MediaUrlDemuxer); 71 DISALLOW_COPY_AND_ASSIGN(MediaUrlDemuxer);
71 }; 72 };
72 73
73 } // namespace media 74 } // namespace media
74 75
75 #endif // MEDIA_BASE_MEDIA_URL_DEMUXER_H_ 76 #endif // MEDIA_BASE_MEDIA_URL_DEMUXER_H_
OLDNEW
« no previous file with comments | « media/base/demuxer.h ('k') | media/base/media_url_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698