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

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

Issue 1332573003: Change return type of AudioEncoder::SetMaxPlaybackRate to void (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@ifc-merge-2
Patch Set: 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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 size_t Max10MsFramesInAPacket() const override; 57 size_t Max10MsFramesInAPacket() const override;
58 int GetTargetBitrate() const override; 58 int GetTargetBitrate() const override;
59 EncodedInfo EncodeInternal(uint32_t rtp_timestamp, 59 EncodedInfo EncodeInternal(uint32_t rtp_timestamp,
60 const int16_t* audio, 60 const int16_t* audio,
61 size_t max_encoded_bytes, 61 size_t max_encoded_bytes,
62 uint8_t* encoded) override; 62 uint8_t* encoded) override;
63 void Reset() override; 63 void Reset() override;
64 bool SetFec(bool enable) override; 64 bool SetFec(bool enable) override;
65 bool SetDtx(bool enable) override; 65 bool SetDtx(bool enable) override;
66 bool SetApplication(Application application) override; 66 bool SetApplication(Application application) override;
67 bool SetMaxPlaybackRate(int frequency_hz) override; 67 void SetMaxPlaybackRate(int frequency_hz) override;
68 void SetProjectedPacketLossRate(double fraction) override; 68 void SetProjectedPacketLossRate(double fraction) override;
69 void SetTargetBitrate(int target_bps) override; 69 void SetTargetBitrate(int target_bps) override;
70 void SetMaxBitrate(int max_bps) override; 70 void SetMaxBitrate(int max_bps) override;
71 void SetMaxPayloadSize(int max_payload_size_bytes) override; 71 void SetMaxPayloadSize(int max_payload_size_bytes) override;
72 72
73 private: 73 private:
74 EncodedInfo EncodePassive(size_t frames_to_encode, 74 EncodedInfo EncodePassive(size_t frames_to_encode,
75 size_t max_encoded_bytes, 75 size_t max_encoded_bytes,
76 uint8_t* encoded); 76 uint8_t* encoded);
77 EncodedInfo EncodeActive(size_t frames_to_encode, 77 EncodedInfo EncodeActive(size_t frames_to_encode,
78 size_t max_encoded_bytes, 78 size_t max_encoded_bytes,
79 uint8_t* encoded); 79 uint8_t* encoded);
80 size_t SamplesPer10msFrame() const; 80 size_t SamplesPer10msFrame() const;
81 81
82 AudioEncoder* speech_encoder_; 82 AudioEncoder* speech_encoder_;
83 const int cng_payload_type_; 83 const int cng_payload_type_;
84 const int num_cng_coefficients_; 84 const int num_cng_coefficients_;
85 const int sid_frame_interval_ms_; 85 const int sid_frame_interval_ms_;
86 std::vector<int16_t> speech_buffer_; 86 std::vector<int16_t> speech_buffer_;
87 std::vector<uint32_t> rtp_timestamps_; 87 std::vector<uint32_t> rtp_timestamps_;
88 bool last_frame_active_; 88 bool last_frame_active_;
89 rtc::scoped_ptr<Vad> vad_; 89 rtc::scoped_ptr<Vad> vad_;
90 rtc::scoped_ptr<CNG_enc_inst, CngInstDeleter> cng_inst_; 90 rtc::scoped_ptr<CNG_enc_inst, CngInstDeleter> cng_inst_;
91 }; 91 };
92 92
93 } // namespace webrtc 93 } // namespace webrtc
94 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_INCLUDE_AUDIO_ENCODER_CNG_H_ 94 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_INCLUDE_AUDIO_ENCODER_CNG_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698