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

Side by Side Diff: webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc

Issue 1319683002: AudioDecoder: Replace Init() with Reset() (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@buffer
Patch Set: review fixes Created 5 years, 3 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 /* 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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 encoderSampRate[clientCntr + (1 - ((clientCntr & 1 )<<1))]); 159 encoderSampRate[clientCntr + (1 - ((clientCntr & 1 )<<1))]);
160 160
161 // Initialize Encoder 161 // Initialize Encoder
162 if(WebRtcIsac_EncoderInit(codecInstance[clientCntr], 162 if(WebRtcIsac_EncoderInit(codecInstance[clientCntr],
163 codingMode) < 0) 163 codingMode) < 0)
164 { 164 {
165 printf("Could not initialize client, %d\n", clientCntr + 1); 165 printf("Could not initialize client, %d\n", clientCntr + 1);
166 return -1; 166 return -1;
167 } 167 }
168 168
169 // Initialize Decoder 169 WebRtcIsac_DecoderInit(codecInstance[clientCntr]);
170 if(WebRtcIsac_DecoderInit(codecInstance[clientCntr]) < 0)
171 {
172 printf("Could not initialize decoder of client %d\n",
173 clientCntr + 1);
174 return -1;
175 }
176 170
177 // setup Rate if in Instantaneous mode 171 // setup Rate if in Instantaneous mode
178 if(codingMode != 0) 172 if(codingMode != 0)
179 { 173 {
180 // ONLY Clients who are not in Adaptive mode 174 // ONLY Clients who are not in Adaptive mode
181 if(WebRtcIsac_Control(codecInstance[clientCntr], 175 if(WebRtcIsac_Control(codecInstance[clientCntr],
182 bottleneck[clientCntr], 30) < 0) 176 bottleneck[clientCntr], 30) < 0)
183 { 177 {
184 printf("Could not setup bottleneck and frame-size for client %d\n", 178 printf("Could not setup bottleneck and frame-size for client %d\n",
185 clientCntr + 1); 179 clientCntr + 1);
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 return -1; 449 return -1;
456 } 450 }
457 } 451 }
458 num10ms[senderIdx] = 0; 452 num10ms[senderIdx] = 0;
459 } 453 }
460 //} 454 //}
461 //} 455 //}
462 } 456 }
463 } 457 }
464 } 458 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698