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

Side by Side Diff: webrtc/modules/utility/source/file_player_impl.cc

Issue 1365283002: Remove AMR format parameter from AudioCoder in utility (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@acm-cleanup-typedefs.h
Patch Set: Created 5 years, 2 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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 } 382 }
383 383
384 int32_t FilePlayerImpl::SetUpAudioDecoder() 384 int32_t FilePlayerImpl::SetUpAudioDecoder()
385 { 385 {
386 if ((_fileModule.codec_info(_codec) == -1)) 386 if ((_fileModule.codec_info(_codec) == -1))
387 { 387 {
388 LOG(LS_WARNING) << "Failed to retrieve codec info of file data."; 388 LOG(LS_WARNING) << "Failed to retrieve codec info of file data.";
389 return -1; 389 return -1;
390 } 390 }
391 if( STR_CASE_CMP(_codec.plname, "L16") != 0 && 391 if( STR_CASE_CMP(_codec.plname, "L16") != 0 &&
392 _audioDecoder.SetDecodeCodec(_codec,AMRFileStorage) == -1) 392 _audioDecoder.SetDecodeCodec(_codec) == -1)
393 { 393 {
394 LOG(LS_WARNING) << "SetUpAudioDecoder() codec " << _codec.plname 394 LOG(LS_WARNING) << "SetUpAudioDecoder() codec " << _codec.plname
395 << " not supported."; 395 << " not supported.";
396 return -1; 396 return -1;
397 } 397 }
398 _numberOf10MsPerFrame = _codec.pacsize / (_codec.plfreq / 100); 398 _numberOf10MsPerFrame = _codec.pacsize / (_codec.plfreq / 100);
399 _numberOf10MsInDecoder = 0; 399 _numberOf10MsInDecoder = 0;
400 return 0; 400 return 0;
401 } 401 }
402 } // namespace webrtc 402 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/utility/source/coder.cc ('k') | webrtc/modules/utility/source/file_recorder_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698