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

Side by Side Diff: webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h

Issue 1702943002: Pass ownership of external encoders to the ACM (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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 <memory>
14 #include <vector> 15 #include <vector>
15 16
16 #include "webrtc/base/buffer.h" 17 #include "webrtc/base/buffer.h"
17 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" 18 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
18 19
19 namespace webrtc { 20 namespace webrtc {
20 21
21 // This class implements redundant audio coding. The class object will have an 22 // This class implements redundant audio coding. The class object will have an
22 // underlying AudioEncoder object that performs the actual encodings. The 23 // underlying AudioEncoder object that performs the actual encodings. The
23 // current class will gather the two latest encodings from the underlying codec 24 // current class will gather the two latest encodings from the underlying codec
24 // into one packet. 25 // into one packet.
25 class AudioEncoderCopyRed final : public AudioEncoder { 26 class AudioEncoderCopyRed final : public AudioEncoder {
26 public: 27 public:
27 struct Config { 28 struct Config {
28 public: 29 Config();
30 Config(Config&&);
31 ~Config();
29 int payload_type; 32 int payload_type;
30 AudioEncoder* speech_encoder; 33 std::unique_ptr<AudioEncoder> speech_encoder;
31 }; 34 };
32 35
33 // Caller keeps ownership of the AudioEncoder object. 36 explicit AudioEncoderCopyRed(Config&& config);
34 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 void Reset() override; 47 void Reset() override;
46 bool SetFec(bool enable) override; 48 bool SetFec(bool enable) override;
47 bool SetDtx(bool enable) override; 49 bool SetDtx(bool enable) override;
48 bool SetApplication(Application application) override; 50 bool SetApplication(Application application) override;
49 void SetMaxPlaybackRate(int frequency_hz) override; 51 void SetMaxPlaybackRate(int frequency_hz) override;
50 void SetProjectedPacketLossRate(double fraction) override; 52 void SetProjectedPacketLossRate(double fraction) override;
51 void SetTargetBitrate(int target_bps) override; 53 void SetTargetBitrate(int target_bps) override;
52 54
53 protected: 55 protected:
54 EncodedInfo EncodeImpl(uint32_t rtp_timestamp, 56 EncodedInfo EncodeImpl(uint32_t rtp_timestamp,
55 rtc::ArrayView<const int16_t> audio, 57 rtc::ArrayView<const int16_t> audio,
56 rtc::Buffer* encoded) override; 58 rtc::Buffer* encoded) override;
57 59
58 private: 60 private:
59 AudioEncoder* speech_encoder_; 61 std::unique_ptr<AudioEncoder> speech_encoder_;
60 int red_payload_type_; 62 int red_payload_type_;
61 rtc::Buffer secondary_encoded_; 63 rtc::Buffer secondary_encoded_;
62 EncodedInfoLeaf secondary_info_; 64 EncodedInfoLeaf secondary_info_;
63 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderCopyRed); 65 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderCopyRed);
64 }; 66 };
65 67
66 } // namespace webrtc 68 } // namespace webrtc
67 69
68 #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