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

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

Issue 6179006: Fix flaky behavior in pipeline teardown. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | media/base/pipeline_impl.cc » ('j') | media/base/pipeline_impl.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // Implementation of Pipeline. 5 // Implementation of Pipeline.
6 6
7 #ifndef MEDIA_BASE_PIPELINE_IMPL_H_ 7 #ifndef MEDIA_BASE_PIPELINE_IMPL_H_
8 #define MEDIA_BASE_PIPELINE_IMPL_H_ 8 #define MEDIA_BASE_PIPELINE_IMPL_H_
9 9
10 #include <set> 10 #include <set>
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 287
288 // Whether or not the pipeline is in transition for a seek operation. 288 // Whether or not the pipeline is in transition for a seek operation.
289 bool seek_pending_; 289 bool seek_pending_;
290 290
291 // Whether or not the pipeline is pending a stop operation. 291 // Whether or not the pipeline is pending a stop operation.
292 bool stop_pending_; 292 bool stop_pending_;
293 293
294 // Whether or not the pipeline is perform a stop operation. 294 // Whether or not the pipeline is perform a stop operation.
295 bool tearing_down_; 295 bool tearing_down_;
296 296
297 // Whether or not an error triggered the teardown.
298 bool error_caused_teardown_;
299
297 // Duration of the media in microseconds. Set by filters. 300 // Duration of the media in microseconds. Set by filters.
298 base::TimeDelta duration_; 301 base::TimeDelta duration_;
299 302
300 // Amount of available buffered data in microseconds. Set by filters. 303 // Amount of available buffered data in microseconds. Set by filters.
301 base::TimeDelta buffered_time_; 304 base::TimeDelta buffered_time_;
302 305
303 // Amount of available buffered data. Set by filters. 306 // Amount of available buffered data. Set by filters.
304 int64 buffered_bytes_; 307 int64 buffered_bytes_;
305 308
306 // Total size of the media. Set by filters. 309 // Total size of the media. Set by filters.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 404
402 FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, GetBufferedTime); 405 FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, GetBufferedTime);
403 FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, AudioStreamShorterThanVideo); 406 FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, AudioStreamShorterThanVideo);
404 407
405 DISALLOW_COPY_AND_ASSIGN(PipelineImpl); 408 DISALLOW_COPY_AND_ASSIGN(PipelineImpl);
406 }; 409 };
407 410
408 } // namespace media 411 } // namespace media
409 412
410 #endif // MEDIA_BASE_PIPELINE_IMPL_H_ 413 #endif // MEDIA_BASE_PIPELINE_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | media/base/pipeline_impl.cc » ('j') | media/base/pipeline_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698