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

Side by Side Diff: media/renderers/audio_renderer_impl.h

Issue 1423163004: media: Replace DecryptorReadyCB with CdmReadyCB. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 5 years, 1 month 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 | « media/filters/video_frame_stream_unittest.cc ('k') | media/renderers/audio_renderer_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) 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 // Audio rendering unit utilizing an AudioRendererSink to output data. 5 // Audio rendering unit utilizing an AudioRendererSink to output data.
6 // 6 //
7 // This class lives inside three threads during it's lifetime, namely: 7 // This class lives inside three threads during it's lifetime, namely:
8 // 1. Render thread 8 // 1. Render thread
9 // Where the object is created. 9 // Where the object is created.
10 // 2. Media thread (provided via constructor) 10 // 2. Media thread (provided via constructor)
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 void SetPlaybackRate(double rate) override; 71 void SetPlaybackRate(double rate) override;
72 void SetMediaTime(base::TimeDelta time) override; 72 void SetMediaTime(base::TimeDelta time) override;
73 base::TimeDelta CurrentMediaTime() override; 73 base::TimeDelta CurrentMediaTime() override;
74 bool GetWallClockTimes( 74 bool GetWallClockTimes(
75 const std::vector<base::TimeDelta>& media_timestamps, 75 const std::vector<base::TimeDelta>& media_timestamps,
76 std::vector<base::TimeTicks>* wall_clock_times) override; 76 std::vector<base::TimeTicks>* wall_clock_times) override;
77 77
78 // AudioRenderer implementation. 78 // AudioRenderer implementation.
79 void Initialize(DemuxerStream* stream, 79 void Initialize(DemuxerStream* stream,
80 const PipelineStatusCB& init_cb, 80 const PipelineStatusCB& init_cb,
81 const SetDecryptorReadyCB& set_decryptor_ready_cb, 81 const SetCdmReadyCB& set_cdm_ready_cb,
82 const StatisticsCB& statistics_cb, 82 const StatisticsCB& statistics_cb,
83 const BufferingStateCB& buffering_state_cb, 83 const BufferingStateCB& buffering_state_cb,
84 const base::Closure& ended_cb, 84 const base::Closure& ended_cb,
85 const PipelineStatusCB& error_cb, 85 const PipelineStatusCB& error_cb,
86 const base::Closure& waiting_for_decryption_key_cb) override; 86 const base::Closure& waiting_for_decryption_key_cb) override;
87 TimeSource* GetTimeSource() override; 87 TimeSource* GetTimeSource() override;
88 void Flush(const base::Closure& callback) override; 88 void Flush(const base::Closure& callback) override;
89 void StartPlaying() override; 89 void StartPlaying() override;
90 void SetVolume(float volume) override; 90 void SetVolume(float volume) override;
91 91
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 279
280 // NOTE: Weak pointers must be invalidated before all other member variables. 280 // NOTE: Weak pointers must be invalidated before all other member variables.
281 base::WeakPtrFactory<AudioRendererImpl> weak_factory_; 281 base::WeakPtrFactory<AudioRendererImpl> weak_factory_;
282 282
283 DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl); 283 DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
284 }; 284 };
285 285
286 } // namespace media 286 } // namespace media
287 287
288 #endif // MEDIA_RENDERERS_AUDIO_RENDERER_IMPL_H_ 288 #endif // MEDIA_RENDERERS_AUDIO_RENDERER_IMPL_H_
OLDNEW
« no previous file with comments | « media/filters/video_frame_stream_unittest.cc ('k') | media/renderers/audio_renderer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698