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

Side by Side Diff: webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc

Issue 1534193008: Misc. small cleanups (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Unnecessary parens Created 4 years, 11 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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
11 #include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h" 11 #include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
12 12
13 #include "webrtc/base/checks.h" 13 #include "webrtc/base/checks.h"
14 #include "webrtc/common_types.h" 14 #include "webrtc/common_types.h"
15 #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" 15 #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 size_t AudioEncoderPcm16B::EncodeCall(const int16_t* audio, 19 size_t AudioEncoderPcm16B::EncodeCall(const int16_t* audio,
20 size_t input_len, 20 size_t input_len,
21 uint8_t* encoded) { 21 uint8_t* encoded) {
22 return WebRtcPcm16b_Encode(audio, input_len, encoded); 22 return WebRtcPcm16b_Encode(audio, input_len, encoded);
23 } 23 }
24 24
25 int AudioEncoderPcm16B::BytesPerSample() const { 25 size_t AudioEncoderPcm16B::BytesPerSample() const {
26 return 2; 26 return 2;
27 } 27 }
28 28
29 namespace { 29 namespace {
30 AudioEncoderPcm16B::Config CreateConfig(const CodecInst& codec_inst) { 30 AudioEncoderPcm16B::Config CreateConfig(const CodecInst& codec_inst) {
31 AudioEncoderPcm16B::Config config; 31 AudioEncoderPcm16B::Config config;
32 config.num_channels = codec_inst.channels; 32 config.num_channels = codec_inst.channels;
33 config.sample_rate_hz = codec_inst.plfreq; 33 config.sample_rate_hz = codec_inst.plfreq;
34 config.frame_size_ms = rtc::CheckedDivExact( 34 config.frame_size_ms = rtc::CheckedDivExact(
35 codec_inst.pacsize, rtc::CheckedDivExact(config.sample_rate_hz, 1000)); 35 codec_inst.pacsize, rtc::CheckedDivExact(config.sample_rate_hz, 1000));
36 config.payload_type = codec_inst.pltype; 36 config.payload_type = codec_inst.pltype;
37 return config; 37 return config;
38 } 38 }
39 } // namespace 39 } // namespace
40 40
41 bool AudioEncoderPcm16B::Config::IsOk() const { 41 bool AudioEncoderPcm16B::Config::IsOk() const {
42 if ((sample_rate_hz != 8000) && (sample_rate_hz != 16000) && 42 if ((sample_rate_hz != 8000) && (sample_rate_hz != 16000) &&
43 (sample_rate_hz != 32000) && (sample_rate_hz != 48000)) 43 (sample_rate_hz != 32000) && (sample_rate_hz != 48000))
44 return false; 44 return false;
45 return AudioEncoderPcm::Config::IsOk(); 45 return AudioEncoderPcm::Config::IsOk();
46 } 46 }
47 47
48 AudioEncoderPcm16B::AudioEncoderPcm16B(const CodecInst& codec_inst) 48 AudioEncoderPcm16B::AudioEncoderPcm16B(const CodecInst& codec_inst)
49 : AudioEncoderPcm16B(CreateConfig(codec_inst)) {} 49 : AudioEncoderPcm16B(CreateConfig(codec_inst)) {}
50 50
51 } // namespace webrtc 51 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698