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

Side by Side Diff: webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h

Issue 1725143003: Changed AudioEncoder::Encode to take an rtc::Buffer* instead of uint8_t* and a maximum size. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Reverted unnecessary change to buffer_unittest.cc Created 4 years, 9 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 52
53 size_t MaxEncodedBytes() const override; 53 size_t MaxEncodedBytes() const override;
54 int SampleRateHz() const override; 54 int SampleRateHz() const override;
55 size_t NumChannels() const override; 55 size_t NumChannels() const override;
56 int RtpTimestampRateHz() const override; 56 int RtpTimestampRateHz() const override;
57 size_t Num10MsFramesInNextPacket() const override; 57 size_t Num10MsFramesInNextPacket() const override;
58 size_t Max10MsFramesInAPacket() const override; 58 size_t Max10MsFramesInAPacket() const override;
59 int GetTargetBitrate() const override; 59 int GetTargetBitrate() const override;
60 EncodedInfo EncodeInternal(uint32_t rtp_timestamp, 60 EncodedInfo EncodeInternal(uint32_t rtp_timestamp,
61 rtc::ArrayView<const int16_t> audio, 61 rtc::ArrayView<const int16_t> audio,
62 size_t max_encoded_bytes, 62 rtc::Buffer* encoded) override;
63 uint8_t* encoded) override;
64 void Reset() override; 63 void Reset() override;
65 bool SetFec(bool enable) override; 64 bool SetFec(bool enable) override;
66 bool SetDtx(bool enable) override; 65 bool SetDtx(bool enable) override;
67 bool SetApplication(Application application) override; 66 bool SetApplication(Application application) override;
68 void SetMaxPlaybackRate(int frequency_hz) override; 67 void SetMaxPlaybackRate(int frequency_hz) override;
69 void SetProjectedPacketLossRate(double fraction) override; 68 void SetProjectedPacketLossRate(double fraction) override;
70 void SetTargetBitrate(int target_bps) override; 69 void SetTargetBitrate(int target_bps) override;
71 70
72 private: 71 private:
73 EncodedInfo EncodePassive(size_t frames_to_encode, 72 EncodedInfo EncodePassive(size_t frames_to_encode,
74 size_t max_encoded_bytes, 73 rtc::Buffer* encoded);
75 uint8_t* encoded);
76 EncodedInfo EncodeActive(size_t frames_to_encode, 74 EncodedInfo EncodeActive(size_t frames_to_encode,
77 size_t max_encoded_bytes, 75 rtc::Buffer* encoded);
78 uint8_t* encoded);
79 size_t SamplesPer10msFrame() const; 76 size_t SamplesPer10msFrame() const;
80 77
81 AudioEncoder* speech_encoder_; 78 AudioEncoder* speech_encoder_;
82 const int cng_payload_type_; 79 const int cng_payload_type_;
83 const int num_cng_coefficients_; 80 const int num_cng_coefficients_;
84 const int sid_frame_interval_ms_; 81 const int sid_frame_interval_ms_;
85 std::vector<int16_t> speech_buffer_; 82 std::vector<int16_t> speech_buffer_;
86 std::vector<uint32_t> rtp_timestamps_; 83 std::vector<uint32_t> rtp_timestamps_;
87 bool last_frame_active_; 84 bool last_frame_active_;
88 std::unique_ptr<Vad> vad_; 85 std::unique_ptr<Vad> vad_;
89 std::unique_ptr<CNG_enc_inst, CngInstDeleter> cng_inst_; 86 std::unique_ptr<CNG_enc_inst, CngInstDeleter> cng_inst_;
90 87
91 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderCng); 88 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderCng);
92 }; 89 };
93 90
94 } // namespace webrtc 91 } // namespace webrtc
95 92
96 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_ 93 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698