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

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

Issue 12262058: Revert r180578, r180591, and r180604 from 1410 branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1410/src/
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/pipeline.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_H_ 5 #ifndef MEDIA_BASE_PIPELINE_H_
6 #define MEDIA_BASE_PIPELINE_H_ 6 #define MEDIA_BASE_PIPELINE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 // Temporary callback used for Stop(). 444 // Temporary callback used for Stop().
445 base::Closure stop_cb_; 445 base::Closure stop_cb_;
446 446
447 // Permanent callbacks passed in via Start(). 447 // Permanent callbacks passed in via Start().
448 base::Closure ended_cb_; 448 base::Closure ended_cb_;
449 PipelineStatusCB error_cb_; 449 PipelineStatusCB error_cb_;
450 BufferingStateCB buffering_state_cb_; 450 BufferingStateCB buffering_state_cb_;
451 451
452 // Renderer references used for setting the volume, playback rate, and 452 // Renderer references used for setting the volume, playback rate, and
453 // determining when playback has finished. 453 // determining when playback has finished.
454 scoped_ptr<AudioRenderer> audio_renderer_; 454 scoped_refptr<AudioRenderer> audio_renderer_;
455 scoped_ptr<VideoRenderer> video_renderer_; 455 scoped_refptr<VideoRenderer> video_renderer_;
456 456
457 // Demuxer reference used for setting the preload value. 457 // Demuxer reference used for setting the preload value.
458 scoped_refptr<Demuxer> demuxer_; 458 scoped_refptr<Demuxer> demuxer_;
459 459
460 PipelineStatistics statistics_; 460 PipelineStatistics statistics_;
461 461
462 // Time of pipeline creation; is non-zero only until the pipeline first 462 // Time of pipeline creation; is non-zero only until the pipeline first
463 // reaches "kStarted", at which point it is used & zeroed out. 463 // reaches "kStarted", at which point it is used & zeroed out.
464 base::Time creation_time_; 464 base::Time creation_time_;
465 465
466 scoped_ptr<SerialRunner> pending_callbacks_; 466 scoped_ptr<SerialRunner> pending_callbacks_;
467 467
468 base::ThreadChecker thread_checker_; 468 base::ThreadChecker thread_checker_;
469 469
470 DISALLOW_COPY_AND_ASSIGN(Pipeline); 470 DISALLOW_COPY_AND_ASSIGN(Pipeline);
471 }; 471 };
472 472
473 } // namespace media 473 } // namespace media
474 474
475 #endif // MEDIA_BASE_PIPELINE_H_ 475 #endif // MEDIA_BASE_PIPELINE_H_
OLDNEW
« no previous file with comments | « media/base/mock_filters.h ('k') | media/base/pipeline.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698