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

Side by Side Diff: webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.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_ILBC_AUDIO_ENCODER_ILBC_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_
13 13
14 #include "webrtc/base/constructormagic.h" 14 #include "webrtc/base/constructormagic.h"
15 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" 15 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
16 #include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h" 16 #include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h"
17 17
18 namespace webrtc { 18 namespace webrtc {
19 19
20 struct CodecInst; 20 struct CodecInst;
21 21
22 class AudioEncoderIlbc final : public AudioEncoder { 22 class AudioEncoderIlbc final : public AudioEncoder {
23 public: 23 public:
24 using AudioEncoder::EncodeInternal;
25
26 struct Config { 24 struct Config {
27 bool IsOk() const; 25 bool IsOk() const;
28 26
29 int payload_type = 102; 27 int payload_type = 102;
30 int frame_size_ms = 30; // Valid values are 20, 30, 40, and 60 ms. 28 int frame_size_ms = 30; // Valid values are 20, 30, 40, and 60 ms.
31 // Note that frame size 40 ms produces encodings with two 20 ms frames in 29 // Note that frame size 40 ms produces encodings with two 20 ms frames in
32 // them, and frame size 60 ms consists of two 30 ms frames. 30 // them, and frame size 60 ms consists of two 30 ms frames.
33 }; 31 };
34 32
35 explicit AudioEncoderIlbc(const Config& config); 33 explicit AudioEncoderIlbc(const Config& config);
36 explicit AudioEncoderIlbc(const CodecInst& codec_inst); 34 explicit AudioEncoderIlbc(const CodecInst& codec_inst);
37 ~AudioEncoderIlbc() override; 35 ~AudioEncoderIlbc() override;
38 36
39 size_t MaxEncodedBytes() const override; 37 size_t MaxEncodedBytes() const override;
40 int SampleRateHz() const override; 38 int SampleRateHz() const override;
41 size_t NumChannels() const override; 39 size_t NumChannels() const override;
42 size_t Num10MsFramesInNextPacket() const override; 40 size_t Num10MsFramesInNextPacket() const override;
43 size_t Max10MsFramesInAPacket() const override; 41 size_t Max10MsFramesInAPacket() const override;
44 int GetTargetBitrate() const override; 42 int GetTargetBitrate() const override;
45 EncodedInfo EncodeInternal(uint32_t rtp_timestamp, 43 EncodedInfo EncodeImpl(uint32_t rtp_timestamp,
46 rtc::ArrayView<const int16_t> audio, 44 rtc::ArrayView<const int16_t> audio,
47 rtc::Buffer* encoded) override; 45 rtc::Buffer* encoded) override;
48 void Reset() override; 46 void Reset() override;
49 47
50 private: 48 private:
51 size_t RequiredOutputSizeBytes() const; 49 size_t RequiredOutputSizeBytes() const;
52 50
53 static const size_t kMaxSamplesPerPacket = 480; 51 static const size_t kMaxSamplesPerPacket = 480;
54 const Config config_; 52 const Config config_;
55 const size_t num_10ms_frames_per_packet_; 53 const size_t num_10ms_frames_per_packet_;
56 size_t num_10ms_frames_buffered_; 54 size_t num_10ms_frames_buffered_;
57 uint32_t first_timestamp_in_buffer_; 55 uint32_t first_timestamp_in_buffer_;
58 int16_t input_buffer_[kMaxSamplesPerPacket]; 56 int16_t input_buffer_[kMaxSamplesPerPacket];
59 IlbcEncoderInstance* encoder_; 57 IlbcEncoderInstance* encoder_;
60 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderIlbc); 58 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderIlbc);
61 }; 59 };
62 60
63 } // namespace webrtc 61 } // namespace webrtc
64 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_ 62 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_ENCODER_ILBC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698