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

Side by Side Diff: webrtc/modules/audio_coding/codecs/g722/include/audio_encoder_g722.h

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
(...skipping 19 matching lines...) Expand all
30 int num_channels; 30 int num_channels;
31 }; 31 };
32 32
33 explicit AudioEncoderG722(const Config& config); 33 explicit AudioEncoderG722(const Config& config);
34 ~AudioEncoderG722() override; 34 ~AudioEncoderG722() override;
35 35
36 int SampleRateHz() const override; 36 int SampleRateHz() const override;
37 int NumChannels() const override; 37 int NumChannels() const override;
38 size_t MaxEncodedBytes() const override; 38 size_t MaxEncodedBytes() const override;
39 int RtpTimestampRateHz() const override; 39 int RtpTimestampRateHz() const override;
40 int Num10MsFramesInNextPacket() const override; 40 size_t Num10MsFramesInNextPacket() const override;
41 int Max10MsFramesInAPacket() const override; 41 size_t Max10MsFramesInAPacket() const override;
42 int GetTargetBitrate() const override; 42 int GetTargetBitrate() const override;
43 EncodedInfo EncodeInternal(uint32_t rtp_timestamp, 43 EncodedInfo EncodeInternal(uint32_t rtp_timestamp,
44 const int16_t* audio, 44 const int16_t* audio,
45 size_t max_encoded_bytes, 45 size_t max_encoded_bytes,
46 uint8_t* encoded) override; 46 uint8_t* encoded) override;
47 47
48 private: 48 private:
49 // The encoder state for one channel. 49 // The encoder state for one channel.
50 struct EncoderState { 50 struct EncoderState {
51 G722EncInst* encoder; 51 G722EncInst* encoder;
52 rtc::scoped_ptr<int16_t[]> speech_buffer; // Queued up for encoding. 52 rtc::scoped_ptr<int16_t[]> speech_buffer; // Queued up for encoding.
53 rtc::Buffer encoded_buffer; // Already encoded. 53 rtc::Buffer encoded_buffer; // Already encoded.
54 EncoderState(); 54 EncoderState();
55 ~EncoderState(); 55 ~EncoderState();
56 }; 56 };
57 57
58 int SamplesPerChannel() const; 58 size_t SamplesPerChannel() const;
59 59
60 const int num_channels_; 60 const int num_channels_;
61 const int payload_type_; 61 const int payload_type_;
62 const int num_10ms_frames_per_packet_; 62 const size_t num_10ms_frames_per_packet_;
63 int num_10ms_frames_buffered_; 63 size_t num_10ms_frames_buffered_;
64 uint32_t first_timestamp_in_buffer_; 64 uint32_t first_timestamp_in_buffer_;
65 const rtc::scoped_ptr<EncoderState[]> encoders_; 65 const rtc::scoped_ptr<EncoderState[]> encoders_;
66 rtc::Buffer interleave_buffer_; 66 rtc::Buffer interleave_buffer_;
67 }; 67 };
68 68
69 struct CodecInst; 69 struct CodecInst;
70 70
71 class AudioEncoderMutableG722 71 class AudioEncoderMutableG722
72 : public AudioEncoderMutableImpl<AudioEncoderG722> { 72 : public AudioEncoderMutableImpl<AudioEncoderG722> {
73 public: 73 public:
74 explicit AudioEncoderMutableG722(const CodecInst& codec_inst); 74 explicit AudioEncoderMutableG722(const CodecInst& codec_inst);
75 }; 75 };
76 76
77 } // namespace webrtc 77 } // namespace webrtc
78 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_INCLUDE_AUDIO_ENCODER_G722_H_ 78 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_INCLUDE_AUDIO_ENCODER_G722_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698