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

Side by Side Diff: webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.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_RED_AUDIO_ENCODER_COPY_RED_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_RED_AUDIO_ENCODER_COPY_RED_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_RED_AUDIO_ENCODER_COPY_RED_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_RED_AUDIO_ENCODER_COPY_RED_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/base/buffer.h" 16 #include "webrtc/base/buffer.h"
17 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" 17 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 // This class implements redundant audio coding. The class object will have an 21 // This class implements redundant audio coding. The class object will have an
22 // underlying AudioEncoder object that performs the actual encodings. The 22 // underlying AudioEncoder object that performs the actual encodings. The
23 // current class will gather the two latest encodings from the underlying codec 23 // current class will gather the two latest encodings from the underlying codec
24 // into one packet. 24 // into one packet.
25 class AudioEncoderCopyRed final : public AudioEncoder { 25 class AudioEncoderCopyRed final : public AudioEncoder {
26 public: 26 public:
27 using AudioEncoder::EncodeInternal;
28
27 struct Config { 29 struct Config {
28 public: 30 public:
29 int payload_type; 31 int payload_type;
30 AudioEncoder* speech_encoder; 32 AudioEncoder* speech_encoder;
31 }; 33 };
32 34
33 // Caller keeps ownership of the AudioEncoder object. 35 // Caller keeps ownership of the AudioEncoder object.
34 explicit AudioEncoderCopyRed(const Config& config); 36 explicit AudioEncoderCopyRed(const Config& config);
35 37
36 ~AudioEncoderCopyRed() override; 38 ~AudioEncoderCopyRed() override;
37 39
38 size_t MaxEncodedBytes() const override; 40 size_t MaxEncodedBytes() const override;
39 int SampleRateHz() const override; 41 int SampleRateHz() const override;
40 size_t NumChannels() const override; 42 size_t NumChannels() const override;
41 int RtpTimestampRateHz() const override; 43 int RtpTimestampRateHz() const override;
42 size_t Num10MsFramesInNextPacket() const override; 44 size_t Num10MsFramesInNextPacket() const override;
43 size_t Max10MsFramesInAPacket() const override; 45 size_t Max10MsFramesInAPacket() const override;
44 int GetTargetBitrate() const override; 46 int GetTargetBitrate() const override;
45 EncodedInfo EncodeInternal(uint32_t rtp_timestamp,
46 rtc::ArrayView<const int16_t> audio,
47 size_t max_encoded_bytes,
48 uint8_t* encoded) override;
49 void Reset() override; 47 void Reset() override;
50 bool SetFec(bool enable) override; 48 bool SetFec(bool enable) override;
51 bool SetDtx(bool enable) override; 49 bool SetDtx(bool enable) override;
52 bool SetApplication(Application application) override; 50 bool SetApplication(Application application) override;
53 void SetMaxPlaybackRate(int frequency_hz) override; 51 void SetMaxPlaybackRate(int frequency_hz) override;
54 void SetProjectedPacketLossRate(double fraction) override; 52 void SetProjectedPacketLossRate(double fraction) override;
55 void SetTargetBitrate(int target_bps) override; 53 void SetTargetBitrate(int target_bps) override;
56 54
55 protected:
56 EncodedInfo EncodeInternal(uint32_t rtp_timestamp,
57 rtc::ArrayView<const int16_t> audio,
58 rtc::Buffer* encoded) override;
59
57 private: 60 private:
58 AudioEncoder* speech_encoder_; 61 AudioEncoder* speech_encoder_;
59 int red_payload_type_; 62 int red_payload_type_;
60 rtc::Buffer secondary_encoded_; 63 rtc::Buffer secondary_encoded_;
61 EncodedInfoLeaf secondary_info_; 64 EncodedInfoLeaf secondary_info_;
62 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderCopyRed); 65 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderCopyRed);
63 }; 66 };
64 67
65 } // namespace webrtc 68 } // namespace webrtc
66 69
67 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_RED_AUDIO_ENCODER_COPY_RED_H_ 70 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_RED_AUDIO_ENCODER_COPY_RED_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698