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

Side by Side Diff: content/renderer/media/webrtc_local_audio_renderer.h

Issue 1538463002: Revert of Forward the number of skipped frames by the OS in audio playout. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 (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 CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_RENDERER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_RENDERER_H_
6 #define CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_RENDERER_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_RENDERER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 // Called on the AudioInputDevice worker thread. 90 // Called on the AudioInputDevice worker thread.
91 void OnData(const media::AudioBus& audio_bus, 91 void OnData(const media::AudioBus& audio_bus,
92 base::TimeTicks estimated_capture_time) override; 92 base::TimeTicks estimated_capture_time) override;
93 93
94 // Called on the AudioInputDevice worker thread. 94 // Called on the AudioInputDevice worker thread.
95 void OnSetFormat(const media::AudioParameters& params) override; 95 void OnSetFormat(const media::AudioParameters& params) override;
96 96
97 // media::AudioRendererSink::RenderCallback implementation. 97 // media::AudioRendererSink::RenderCallback implementation.
98 // Render() is called on the AudioOutputDevice thread and OnRenderError() 98 // Render() is called on the AudioOutputDevice thread and OnRenderError()
99 // on the IO thread. 99 // on the IO thread.
100 int Render(media::AudioBus* audio_bus, uint32_t audio_delay_milliseconds, 100 int Render(media::AudioBus* audio_bus, int audio_delay_milliseconds) override;
101 uint32_t frames_skipped) override;
102 void OnRenderError() override; 101 void OnRenderError() override;
103 102
104 // Initializes and starts the |sink_| if 103 // Initializes and starts the |sink_| if
105 // we have received valid |source_params_| && 104 // we have received valid |source_params_| &&
106 // |playing_| has been set to true && 105 // |playing_| has been set to true &&
107 // |volume_| is not zero. 106 // |volume_| is not zero.
108 void MaybeStartSink(); 107 void MaybeStartSink();
109 108
110 // Sets new |source_params_| and then re-initializes and restarts |sink_|. 109 // Sets new |source_params_| and then re-initializes and restarts |sink_|.
111 void ReconfigureSink(const media::AudioParameters& params); 110 void ReconfigureSink(const media::AudioParameters& params);
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 169
171 // Used to DCHECK that some methods are called on the capture audio thread. 170 // Used to DCHECK that some methods are called on the capture audio thread.
172 base::ThreadChecker capture_thread_checker_; 171 base::ThreadChecker capture_thread_checker_;
173 172
174 DISALLOW_COPY_AND_ASSIGN(WebRtcLocalAudioRenderer); 173 DISALLOW_COPY_AND_ASSIGN(WebRtcLocalAudioRenderer);
175 }; 174 };
176 175
177 } // namespace content 176 } // namespace content
178 177
179 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_RENDERER_H_ 178 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_LOCAL_AUDIO_RENDERER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/webrtc_audio_renderer.cc ('k') | content/renderer/media/webrtc_local_audio_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698