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

Side by Side Diff: chromecast/renderer/media/media_pipeline_proxy.h

Issue 1148253006: Chromecast: Use std::vector to pass video config in CMA (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add more DCHECK Created 5 years, 6 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROMECAST_RENDERER_MEDIA_MEDIA_PIPELINE_PROXY_H_ 5 #ifndef CHROMECAST_RENDERER_MEDIA_MEDIA_PIPELINE_PROXY_H_
6 #define CHROMECAST_RENDERER_MEDIA_MEDIA_PIPELINE_PROXY_H_ 6 #define CHROMECAST_RENDERER_MEDIA_MEDIA_PIPELINE_PROXY_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 25 matching lines...) Expand all
36 // MediaPipeline implementation. 36 // MediaPipeline implementation.
37 void SetClient(const MediaPipelineClient& client) override; 37 void SetClient(const MediaPipelineClient& client) override;
38 void SetCdm(int cdm_id) override; 38 void SetCdm(int cdm_id) override;
39 AudioPipeline* GetAudioPipeline() const override; 39 AudioPipeline* GetAudioPipeline() const override;
40 VideoPipeline* GetVideoPipeline() const override; 40 VideoPipeline* GetVideoPipeline() const override;
41 void InitializeAudio( 41 void InitializeAudio(
42 const ::media::AudioDecoderConfig& config, 42 const ::media::AudioDecoderConfig& config,
43 scoped_ptr<CodedFrameProvider> frame_provider, 43 scoped_ptr<CodedFrameProvider> frame_provider,
44 const ::media::PipelineStatusCB& status_cb) override; 44 const ::media::PipelineStatusCB& status_cb) override;
45 void InitializeVideo( 45 void InitializeVideo(
46 const ::media::VideoDecoderConfig& config, 46 const std::vector<::media::VideoDecoderConfig>& configs,
47 scoped_ptr<CodedFrameProvider> frame_provider, 47 scoped_ptr<CodedFrameProvider> frame_provider,
48 const ::media::PipelineStatusCB& status_cb) override; 48 const ::media::PipelineStatusCB& status_cb) override;
49 void StartPlayingFrom(base::TimeDelta time) override; 49 void StartPlayingFrom(base::TimeDelta time) override;
50 void Flush(const ::media::PipelineStatusCB& status_cb) override; 50 void Flush(const ::media::PipelineStatusCB& status_cb) override;
51 void Stop() override; 51 void Stop() override;
52 void SetPlaybackRate(double playback_rate) override; 52 void SetPlaybackRate(double playback_rate) override;
53 53
54 private: 54 private:
55 void OnProxyFlushDone(const ::media::PipelineStatusCB& status_cb, 55 void OnProxyFlushDone(const ::media::PipelineStatusCB& status_cb,
56 ::media::PipelineStatus status); 56 ::media::PipelineStatus status);
57 57
58 base::ThreadChecker thread_checker_; 58 base::ThreadChecker thread_checker_;
59 59
60 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_; 60 scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
61 61
62 const int render_frame_id_; 62 const int render_frame_id_;
63 63
64 // CMA channel to convey IPC messages. 64 // CMA channel to convey IPC messages.
65 scoped_refptr<MediaChannelProxy> const media_channel_proxy_; 65 scoped_refptr<MediaChannelProxy> const media_channel_proxy_;
66 66
67 scoped_ptr<MediaPipelineProxyInternal> proxy_; 67 scoped_ptr<MediaPipelineProxyInternal> proxy_;
68 68
69 bool has_audio_; 69 bool has_audio_;
70 bool has_video_; 70 bool has_video_;
71 scoped_ptr<AudioPipelineProxy> audio_pipeline_; 71 scoped_ptr<AudioPipelineProxy> audio_pipeline_;
72 scoped_ptr<VideoPipelineProxy> video_pipeline_; 72 scoped_ptr<VideoPipelineProxy> video_pipeline_;
73 scoped_ptr< ::media::SerialRunner> pending_callbacks_; 73 scoped_ptr<::media::SerialRunner> pending_callbacks_;
74 74
75 base::WeakPtr<MediaPipelineProxy> weak_this_; 75 base::WeakPtr<MediaPipelineProxy> weak_this_;
76 base::WeakPtrFactory<MediaPipelineProxy> weak_factory_; 76 base::WeakPtrFactory<MediaPipelineProxy> weak_factory_;
77 77
78 DISALLOW_COPY_AND_ASSIGN(MediaPipelineProxy); 78 DISALLOW_COPY_AND_ASSIGN(MediaPipelineProxy);
79 }; 79 };
80 80
81 } // namespace media 81 } // namespace media
82 } // namespace chromecast 82 } // namespace chromecast
83 83
84 #endif // CHROMECAST_RENDERER_MEDIA_MEDIA_PIPELINE_PROXY_H_ 84 #endif // CHROMECAST_RENDERER_MEDIA_MEDIA_PIPELINE_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698