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

Side by Side Diff: webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h

Issue 1316523002: Convert channel counts to size_t. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Fix compile 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 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_ENCODER_PCM_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_ENCODER_PCM_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_ENCODER_PCM_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_ENCODER_PCM_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/scoped_ptr.h" 16 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" 17 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 class AudioEncoderPcm : public AudioEncoder { 21 class AudioEncoderPcm : public AudioEncoder {
22 public: 22 public:
23 struct Config { 23 struct Config {
24 public: 24 public:
25 bool IsOk() const; 25 bool IsOk() const;
26 26
27 int frame_size_ms; 27 int frame_size_ms;
28 int num_channels; 28 size_t num_channels;
29 int payload_type; 29 int payload_type;
30 30
31 protected: 31 protected:
32 explicit Config(int pt) 32 explicit Config(int pt)
33 : frame_size_ms(20), num_channels(1), payload_type(pt) {} 33 : frame_size_ms(20), num_channels(1), payload_type(pt) {}
34 }; 34 };
35 35
36 ~AudioEncoderPcm() override; 36 ~AudioEncoderPcm() override;
37 37
38 size_t MaxEncodedBytes() const override; 38 size_t MaxEncodedBytes() const override;
39 int SampleRateHz() const override; 39 int SampleRateHz() const override;
40 int NumChannels() const override; 40 size_t NumChannels() const override;
41 size_t Num10MsFramesInNextPacket() const override; 41 size_t Num10MsFramesInNextPacket() const override;
42 size_t Max10MsFramesInAPacket() const override; 42 size_t Max10MsFramesInAPacket() const override;
43 int GetTargetBitrate() const override; 43 int GetTargetBitrate() const override;
44 EncodedInfo EncodeInternal(uint32_t rtp_timestamp, 44 EncodedInfo EncodeInternal(uint32_t rtp_timestamp,
45 rtc::ArrayView<const int16_t> audio, 45 rtc::ArrayView<const int16_t> audio,
46 size_t max_encoded_bytes, 46 size_t max_encoded_bytes,
47 uint8_t* encoded) override; 47 uint8_t* encoded) override;
48 void Reset() override; 48 void Reset() override;
49 49
50 protected: 50 protected:
51 AudioEncoderPcm(const Config& config, int sample_rate_hz); 51 AudioEncoderPcm(const Config& config, int sample_rate_hz);
52 52
53 virtual size_t EncodeCall(const int16_t* audio, 53 virtual size_t EncodeCall(const int16_t* audio,
54 size_t input_len, 54 size_t input_len,
55 uint8_t* encoded) = 0; 55 uint8_t* encoded) = 0;
56 56
57 virtual size_t BytesPerSample() const = 0; 57 virtual size_t BytesPerSample() const = 0;
58 58
59 private: 59 private:
60 const int sample_rate_hz_; 60 const int sample_rate_hz_;
61 const int num_channels_; 61 const size_t num_channels_;
62 const int payload_type_; 62 const int payload_type_;
63 const size_t num_10ms_frames_per_packet_; 63 const size_t num_10ms_frames_per_packet_;
64 const size_t full_frame_samples_; 64 const size_t full_frame_samples_;
65 std::vector<int16_t> speech_buffer_; 65 std::vector<int16_t> speech_buffer_;
66 uint32_t first_timestamp_in_buffer_; 66 uint32_t first_timestamp_in_buffer_;
67 }; 67 };
68 68
69 struct CodecInst; 69 struct CodecInst;
70 70
71 class AudioEncoderPcmA final : public AudioEncoderPcm { 71 class AudioEncoderPcmA final : public AudioEncoderPcm {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 size_t BytesPerSample() const override; 108 size_t BytesPerSample() const override;
109 109
110 private: 110 private:
111 static const int kSampleRateHz = 8000; 111 static const int kSampleRateHz = 8000;
112 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderPcmU); 112 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderPcmU);
113 }; 113 };
114 114
115 } // namespace webrtc 115 } // namespace webrtc
116 116
117 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_ENCODER_PCM_H_ 117 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_ENCODER_PCM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698