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

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

Issue 2621183002: [TO 56] Fix race in media Pipeline::GetMediaTime() after seeking. (Closed)
Patch Set: Created 3 years, 11 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 | « no previous file | media/base/pipeline_impl.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 (c) 2016 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_PIPELINE_IMPL_H_ 5 #ifndef MEDIA_BASE_PIPELINE_IMPL_H_
6 #define MEDIA_BASE_PIPELINE_IMPL_H_ 6 #define MEDIA_BASE_PIPELINE_IMPL_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 // filters. 167 // filters.
168 float volume_; 168 float volume_;
169 169
170 // Current duration as reported by Demuxer. 170 // Current duration as reported by Demuxer.
171 base::TimeDelta duration_; 171 base::TimeDelta duration_;
172 172
173 // Set by GetMediaTime(), used to prevent the current media time value as 173 // Set by GetMediaTime(), used to prevent the current media time value as
174 // reported to JavaScript from going backwards in time. 174 // reported to JavaScript from going backwards in time.
175 mutable base::TimeDelta last_media_time_; 175 mutable base::TimeDelta last_media_time_;
176 176
177 // Set by Seek(), used in place of asking the renderer for current media time
178 // while a seek is pending. Renderer's time cannot be trusted until the seek
179 // has completed.
180 base::TimeDelta seek_time_;
181
177 base::ThreadChecker thread_checker_; 182 base::ThreadChecker thread_checker_;
178 base::WeakPtrFactory<PipelineImpl> weak_factory_; 183 base::WeakPtrFactory<PipelineImpl> weak_factory_;
179 184
180 DISALLOW_COPY_AND_ASSIGN(PipelineImpl); 185 DISALLOW_COPY_AND_ASSIGN(PipelineImpl);
181 }; 186 };
182 187
183 } // namespace media 188 } // namespace media
184 189
185 #endif // MEDIA_BASE_PIPELINE_IMPL_H_ 190 #endif // MEDIA_BASE_PIPELINE_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | media/base/pipeline_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698