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

Side by Side Diff: webrtc/video_engine/vie_sync_module.cc

Issue 1421013006: Delete a chain of methods in ViE, VoE and ACM (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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 | « webrtc/video_engine/vie_sync_module.h ('k') | webrtc/voice_engine/channel.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 } 164 }
165 165
166 if (voe_sync_interface_->SetMinimumPlayoutDelay( 166 if (voe_sync_interface_->SetMinimumPlayoutDelay(
167 voe_channel_id_, target_audio_delay_ms) == -1) { 167 voe_channel_id_, target_audio_delay_ms) == -1) {
168 LOG(LS_ERROR) << "Error setting voice delay."; 168 LOG(LS_ERROR) << "Error setting voice delay.";
169 } 169 }
170 vcm_->SetMinimumPlayoutDelay(target_video_delay_ms); 170 vcm_->SetMinimumPlayoutDelay(target_video_delay_ms);
171 return 0; 171 return 0;
172 } 172 }
173 173
174 int ViESyncModule::SetTargetBufferingDelay(int target_delay_ms) {
175 CriticalSectionScoped cs(data_cs_.get());
176 if (!voe_sync_interface_) {
177 LOG(LS_ERROR) << "voe_sync_interface_ NULL, can't set playout delay.";
178 return -1;
179 }
180 sync_->SetTargetBufferingDelay(target_delay_ms);
181 // Setting initial playout delay to voice engine (video engine is updated via
182 // the VCM interface).
183 voe_sync_interface_->SetInitialPlayoutDelay(voe_channel_id_,
184 target_delay_ms);
185 return 0;
186 }
187
188 } // namespace webrtc 174 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video_engine/vie_sync_module.h ('k') | webrtc/voice_engine/channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698