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

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

Issue 9700006: Move VideoDecoder out of media pipeline. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and a small fix Created 8 years, 9 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
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 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
596 PipelineStatusCB ended_callback_; 596 PipelineStatusCB ended_callback_;
597 PipelineStatusCB error_callback_; 597 PipelineStatusCB error_callback_;
598 NetworkEventCB network_callback_; 598 NetworkEventCB network_callback_;
599 599
600 // Reference to the filter(s) that constitute the pipeline. 600 // Reference to the filter(s) that constitute the pipeline.
601 scoped_refptr<Filter> pipeline_filter_; 601 scoped_refptr<Filter> pipeline_filter_;
602 602
603 // Decoder reference used for signalling imminent shutdown. 603 // Decoder reference used for signalling imminent shutdown.
604 // This is a HACK necessary because WebMediaPlayerImpl::Destroy() holds the 604 // This is a HACK necessary because WebMediaPlayerImpl::Destroy() holds the
605 // renderer thread loop hostage for until PipelineImpl::Stop() calls its 605 // renderer thread loop hostage for until PipelineImpl::Stop() calls its
606 // callback. http://crbug.com/110228 tracks removing this hack. 606 // callback.
607 // This reference should only be used for this hack and no other purposes.
608 // http://crbug.com/110228 tracks removing this hack.
607 scoped_refptr<VideoDecoder> video_decoder_; 609 scoped_refptr<VideoDecoder> video_decoder_;
608 610
609 // Renderer references used for setting the volume and determining 611 // Renderer references used for setting the volume and determining
610 // when playback has finished. 612 // when playback has finished.
611 scoped_refptr<AudioRenderer> audio_renderer_; 613 scoped_refptr<AudioRenderer> audio_renderer_;
612 scoped_refptr<VideoRenderer> video_renderer_; 614 scoped_refptr<VideoRenderer> video_renderer_;
613 615
614 // Demuxer reference used for setting the preload value. 616 // Demuxer reference used for setting the preload value.
615 scoped_refptr<Demuxer> demuxer_; 617 scoped_refptr<Demuxer> demuxer_;
616 618
(...skipping 13 matching lines...) Expand all
630 632
631 // True if the pipeline is actively downloading bytes, false otherwise. 633 // True if the pipeline is actively downloading bytes, false otherwise.
632 bool is_downloading_data_; 634 bool is_downloading_data_;
633 635
634 DISALLOW_COPY_AND_ASSIGN(Pipeline); 636 DISALLOW_COPY_AND_ASSIGN(Pipeline);
635 }; 637 };
636 638
637 } // namespace media 639 } // namespace media
638 640
639 #endif // MEDIA_BASE_PIPELINE_H_ 641 #endif // MEDIA_BASE_PIPELINE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698