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

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

Issue 1230503003: Update a ton of audio code to use size_t more correctly and in general reduce (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Resync 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) 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
(...skipping 21 matching lines...) Expand all
32 protected: 32 protected:
33 explicit Config(int pt) 33 explicit Config(int pt)
34 : frame_size_ms(20), num_channels(1), payload_type(pt) {} 34 : frame_size_ms(20), num_channels(1), payload_type(pt) {}
35 }; 35 };
36 36
37 ~AudioEncoderPcm() override; 37 ~AudioEncoderPcm() override;
38 38
39 int SampleRateHz() const override; 39 int SampleRateHz() const override;
40 int NumChannels() const override; 40 int NumChannels() const override;
41 size_t MaxEncodedBytes() const override; 41 size_t MaxEncodedBytes() const override;
42 int Num10MsFramesInNextPacket() const override; 42 size_t Num10MsFramesInNextPacket() const override;
43 int Max10MsFramesInAPacket() const override; 43 size_t Max10MsFramesInAPacket() const override;
44 int GetTargetBitrate() const override; 44 int GetTargetBitrate() const override;
45 EncodedInfo EncodeInternal(uint32_t rtp_timestamp, 45 EncodedInfo EncodeInternal(uint32_t rtp_timestamp,
46 const int16_t* audio, 46 const int16_t* audio,
47 size_t max_encoded_bytes, 47 size_t max_encoded_bytes,
48 uint8_t* encoded) override; 48 uint8_t* encoded) 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 int16_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 int BytesPerSample() const = 0; 57 virtual int 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 int num_channels_;
62 const int payload_type_; 62 const int payload_type_;
63 const int 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 class AudioEncoderPcmA final : public AudioEncoderPcm { 69 class AudioEncoderPcmA final : public AudioEncoderPcm {
70 public: 70 public:
71 struct Config : public AudioEncoderPcm::Config { 71 struct Config : public AudioEncoderPcm::Config {
72 Config() : AudioEncoderPcm::Config(8) {} 72 Config() : AudioEncoderPcm::Config(8) {}
73 }; 73 };
74 74
75 explicit AudioEncoderPcmA(const Config& config) 75 explicit AudioEncoderPcmA(const Config& config)
76 : AudioEncoderPcm(config, kSampleRateHz) {} 76 : AudioEncoderPcm(config, kSampleRateHz) {}
77 77
78 protected: 78 protected:
79 int16_t EncodeCall(const int16_t* audio, 79 size_t EncodeCall(const int16_t* audio,
80 size_t input_len, 80 size_t input_len,
81 uint8_t* encoded) override; 81 uint8_t* encoded) override;
82 82
83 int BytesPerSample() const override; 83 int BytesPerSample() const override;
84 84
85 private: 85 private:
86 static const int kSampleRateHz = 8000; 86 static const int kSampleRateHz = 8000;
87 }; 87 };
88 88
89 class AudioEncoderPcmU final : public AudioEncoderPcm { 89 class AudioEncoderPcmU final : public AudioEncoderPcm {
90 public: 90 public:
91 struct Config : public AudioEncoderPcm::Config { 91 struct Config : public AudioEncoderPcm::Config {
92 Config() : AudioEncoderPcm::Config(0) {} 92 Config() : AudioEncoderPcm::Config(0) {}
93 }; 93 };
94 94
95 explicit AudioEncoderPcmU(const Config& config) 95 explicit AudioEncoderPcmU(const Config& config)
96 : AudioEncoderPcm(config, kSampleRateHz) {} 96 : AudioEncoderPcm(config, kSampleRateHz) {}
97 97
98 protected: 98 protected:
99 int16_t EncodeCall(const int16_t* audio, 99 size_t EncodeCall(const int16_t* audio,
100 size_t input_len, 100 size_t input_len,
101 uint8_t* encoded) override; 101 uint8_t* encoded) override;
102 102
103 int BytesPerSample() const override; 103 int BytesPerSample() const override;
104 104
105 private: 105 private:
106 static const int kSampleRateHz = 8000; 106 static const int kSampleRateHz = 8000;
107 }; 107 };
108 108
109 struct CodecInst; 109 struct CodecInst;
110 110
111 class AudioEncoderMutablePcmU 111 class AudioEncoderMutablePcmU
112 : public AudioEncoderMutableImpl<AudioEncoderPcmU> { 112 : public AudioEncoderMutableImpl<AudioEncoderPcmU> {
113 public: 113 public:
114 explicit AudioEncoderMutablePcmU(const CodecInst& codec_inst); 114 explicit AudioEncoderMutablePcmU(const CodecInst& codec_inst);
115 }; 115 };
116 116
117 class AudioEncoderMutablePcmA 117 class AudioEncoderMutablePcmA
118 : public AudioEncoderMutableImpl<AudioEncoderPcmA> { 118 : public AudioEncoderMutableImpl<AudioEncoderPcmA> {
119 public: 119 public:
120 explicit AudioEncoderMutablePcmA(const CodecInst& codec_inst); 120 explicit AudioEncoderMutablePcmA(const CodecInst& codec_inst);
121 }; 121 };
122 122
123 } // namespace webrtc 123 } // namespace webrtc
124 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_INCLUDE_AUDIO_ENCODER_PCM_H_ 124 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_INCLUDE_AUDIO_ENCODER_PCM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698