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

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

Issue 2537243004: Revert of Renaming AudioEncoder::SetTargetBitrate and SetProjectedPacketLossRate. (Closed)
Patch Set: Created 4 years 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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 size_t Max10MsFramesInAPacket() const override; 54 size_t Max10MsFramesInAPacket() const override;
55 int GetTargetBitrate() const override; 55 int GetTargetBitrate() const override;
56 EncodedInfo EncodeImpl(uint32_t rtp_timestamp, 56 EncodedInfo EncodeImpl(uint32_t rtp_timestamp,
57 rtc::ArrayView<const int16_t> audio, 57 rtc::ArrayView<const int16_t> audio,
58 rtc::Buffer* encoded) override; 58 rtc::Buffer* encoded) override;
59 void Reset() override; 59 void Reset() override;
60 bool SetFec(bool enable) override; 60 bool SetFec(bool enable) override;
61 bool SetDtx(bool enable) override; 61 bool SetDtx(bool enable) override;
62 bool SetApplication(Application application) override; 62 bool SetApplication(Application application) override;
63 void SetMaxPlaybackRate(int frequency_hz) override; 63 void SetMaxPlaybackRate(int frequency_hz) override;
64 void SetProjectedPacketLossRate(double fraction) override;
65 void SetTargetBitrate(int target_bps) override;
64 rtc::ArrayView<std::unique_ptr<AudioEncoder>> ReclaimContainedEncoders() 66 rtc::ArrayView<std::unique_ptr<AudioEncoder>> ReclaimContainedEncoders()
65 override; 67 override;
66 void OnReceivedUplinkPacketLossFraction(
67 float uplink_packet_loss_fraction) override;
68 void OnReceivedTargetAudioBitrate(int target_audio_bitrate_bps) override;
69 68
70 private: 69 private:
71 EncodedInfo EncodePassive(size_t frames_to_encode, 70 EncodedInfo EncodePassive(size_t frames_to_encode,
72 rtc::Buffer* encoded); 71 rtc::Buffer* encoded);
73 EncodedInfo EncodeActive(size_t frames_to_encode, 72 EncodedInfo EncodeActive(size_t frames_to_encode,
74 rtc::Buffer* encoded); 73 rtc::Buffer* encoded);
75 size_t SamplesPer10msFrame() const; 74 size_t SamplesPer10msFrame() const;
76 75
77 std::unique_ptr<AudioEncoder> speech_encoder_; 76 std::unique_ptr<AudioEncoder> speech_encoder_;
78 const int cng_payload_type_; 77 const int cng_payload_type_;
79 const int num_cng_coefficients_; 78 const int num_cng_coefficients_;
80 const int sid_frame_interval_ms_; 79 const int sid_frame_interval_ms_;
81 std::vector<int16_t> speech_buffer_; 80 std::vector<int16_t> speech_buffer_;
82 std::vector<uint32_t> rtp_timestamps_; 81 std::vector<uint32_t> rtp_timestamps_;
83 bool last_frame_active_; 82 bool last_frame_active_;
84 std::unique_ptr<Vad> vad_; 83 std::unique_ptr<Vad> vad_;
85 std::unique_ptr<ComfortNoiseEncoder> cng_encoder_; 84 std::unique_ptr<ComfortNoiseEncoder> cng_encoder_;
86 85
87 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderCng); 86 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderCng);
88 }; 87 };
89 88
90 } // namespace webrtc 89 } // namespace webrtc
91 90
92 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_ 91 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_AUDIO_ENCODER_CNG_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/codecs/audio_encoder.cc ('k') | webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698