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

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

Powered by Google App Engine
This is Rietveld 408576698