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

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

Issue 1225173002: Update audio code to use size_t more correctly, (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Review comments Created 5 years, 4 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/include/audio_encoder_pcm16b .h" 11 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/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/include/pcm16b.h" 15 #include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 bool AudioEncoderPcm16B::Config::IsOk() const { 19 bool AudioEncoderPcm16B::Config::IsOk() const {
20 if ((sample_rate_hz != 8000) && (sample_rate_hz != 16000) && 20 if ((sample_rate_hz != 8000) && (sample_rate_hz != 16000) &&
21 (sample_rate_hz != 32000) && (sample_rate_hz != 48000)) 21 (sample_rate_hz != 32000) && (sample_rate_hz != 48000))
22 return false; 22 return false;
23 return AudioEncoderPcm::Config::IsOk(); 23 return AudioEncoderPcm::Config::IsOk();
24 } 24 }
25 25
26 int16_t AudioEncoderPcm16B::EncodeCall(const int16_t* audio, 26 size_t AudioEncoderPcm16B::EncodeCall(const int16_t* audio,
27 size_t input_len, 27 size_t input_len,
28 uint8_t* encoded) { 28 uint8_t* encoded) {
29 return WebRtcPcm16b_Encode(audio, static_cast<int16_t>(input_len), encoded); 29 return WebRtcPcm16b_Encode(audio, input_len, encoded);
30 } 30 }
31 31
32 int AudioEncoderPcm16B::BytesPerSample() const { 32 int AudioEncoderPcm16B::BytesPerSample() const {
33 return 2; 33 return 2;
34 } 34 }
35 35
36 namespace { 36 namespace {
37 AudioEncoderPcm16B::Config CreateConfig(const CodecInst& codec_inst) { 37 AudioEncoderPcm16B::Config CreateConfig(const CodecInst& codec_inst) {
38 AudioEncoderPcm16B::Config config; 38 AudioEncoderPcm16B::Config config;
39 config.num_channels = codec_inst.channels; 39 config.num_channels = codec_inst.channels;
40 config.sample_rate_hz = codec_inst.plfreq; 40 config.sample_rate_hz = codec_inst.plfreq;
41 config.frame_size_ms = rtc::CheckedDivExact( 41 config.frame_size_ms = rtc::CheckedDivExact(
42 codec_inst.pacsize, rtc::CheckedDivExact(config.sample_rate_hz, 1000)); 42 codec_inst.pacsize, rtc::CheckedDivExact(config.sample_rate_hz, 1000));
43 config.payload_type = codec_inst.pltype; 43 config.payload_type = codec_inst.pltype;
44 return config; 44 return config;
45 } 45 }
46 } // namespace 46 } // namespace
47 47
48 AudioEncoderMutablePcm16B::AudioEncoderMutablePcm16B( 48 AudioEncoderMutablePcm16B::AudioEncoderMutablePcm16B(
49 const CodecInst& codec_inst) 49 const CodecInst& codec_inst)
50 : AudioEncoderMutableImpl<AudioEncoderPcm16B>(CreateConfig(codec_inst)) { 50 : AudioEncoderMutableImpl<AudioEncoderPcm16B>(CreateConfig(codec_inst)) {
51 } 51 }
52 52
53 } // namespace webrtc 53 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698