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

Side by Side Diff: webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h

Issue 1764583003: Renamed new EncodeInternal to EncodeImpl to ensure proper backwards compatibility. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Clarified doc comments in AudioEncoder. 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
11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/constructormagic.h" 16 #include "webrtc/base/constructormagic.h"
17 #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h" 17 #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
18 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" 18 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 21
22 struct CodecInst; 22 struct CodecInst;
23 23
24 class AudioEncoderOpus final : public AudioEncoder { 24 class AudioEncoderOpus final : public AudioEncoder {
25 public: 25 public:
26 using AudioEncoder::EncodeInternal;
27
28 enum ApplicationMode { 26 enum ApplicationMode {
29 kVoip = 0, 27 kVoip = 0,
30 kAudio = 1, 28 kAudio = 1,
31 }; 29 };
32 30
33 struct Config { 31 struct Config {
34 bool IsOk() const; 32 bool IsOk() const;
35 int frame_size_ms = 20; 33 int frame_size_ms = 20;
36 size_t num_channels = 1; 34 size_t num_channels = 1;
37 int payload_type = 120; 35 int payload_type = 120;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 void SetMaxPlaybackRate(int frequency_hz) override; 73 void SetMaxPlaybackRate(int frequency_hz) override;
76 void SetProjectedPacketLossRate(double fraction) override; 74 void SetProjectedPacketLossRate(double fraction) override;
77 void SetTargetBitrate(int target_bps) override; 75 void SetTargetBitrate(int target_bps) override;
78 76
79 // Getters for testing. 77 // Getters for testing.
80 double packet_loss_rate() const { return packet_loss_rate_; } 78 double packet_loss_rate() const { return packet_loss_rate_; }
81 ApplicationMode application() const { return config_.application; } 79 ApplicationMode application() const { return config_.application; }
82 bool dtx_enabled() const { return config_.dtx_enabled; } 80 bool dtx_enabled() const { return config_.dtx_enabled; }
83 81
84 protected: 82 protected:
85 EncodedInfo EncodeInternal(uint32_t rtp_timestamp, 83 EncodedInfo EncodeImpl(uint32_t rtp_timestamp,
86 rtc::ArrayView<const int16_t> audio, 84 rtc::ArrayView<const int16_t> audio,
87 rtc::Buffer* encoded) override; 85 rtc::Buffer* encoded) override;
88 86
89 private: 87 private:
90 size_t Num10msFramesPerPacket() const; 88 size_t Num10msFramesPerPacket() const;
91 size_t SamplesPer10msFrame() const; 89 size_t SamplesPer10msFrame() const;
92 bool RecreateEncoderInstance(const Config& config); 90 bool RecreateEncoderInstance(const Config& config);
93 91
94 Config config_; 92 Config config_;
95 double packet_loss_rate_; 93 double packet_loss_rate_;
96 std::vector<int16_t> input_buffer_; 94 std::vector<int16_t> input_buffer_;
97 OpusEncInst* inst_; 95 OpusEncInst* inst_;
98 uint32_t first_timestamp_in_buffer_; 96 uint32_t first_timestamp_in_buffer_;
99 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderOpus); 97 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderOpus);
100 }; 98 };
101 99
102 } // namespace webrtc 100 } // namespace webrtc
103 101
104 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_ 102 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_ENCODER_OPUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698