| Index: webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h
|
| diff --git a/webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h b/webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h
|
| deleted file mode 100644
|
| index c0d61c30a20f4d2bbda127d86cb47f6942d4c5fe..0000000000000000000000000000000000000000
|
| --- a/webrtc/modules/audio_coding/codecs/cng/include/audio_encoder_cng.h
|
| +++ /dev/null
|
| @@ -1,95 +0,0 @@
|
| -/*
|
| - * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
| - *
|
| - * Use of this source code is governed by a BSD-style license
|
| - * that can be found in the LICENSE file in the root of the source
|
| - * tree. An additional intellectual property rights grant can be found
|
| - * in the file PATENTS. All contributing project authors may
|
| - * be found in the AUTHORS file in the root of the source tree.
|
| - */
|
| -
|
| -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_INCLUDE_AUDIO_ENCODER_CNG_H_
|
| -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_INCLUDE_AUDIO_ENCODER_CNG_H_
|
| -
|
| -#include <vector>
|
| -
|
| -#include "webrtc/base/scoped_ptr.h"
|
| -#include "webrtc/common_audio/vad/include/vad.h"
|
| -#include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
|
| -#include "webrtc/modules/audio_coding/codecs/cng/include/webrtc_cng.h"
|
| -
|
| -namespace webrtc {
|
| -
|
| -// Deleter for use with scoped_ptr.
|
| -struct CngInstDeleter {
|
| - void operator()(CNG_enc_inst* ptr) const { WebRtcCng_FreeEnc(ptr); }
|
| -};
|
| -
|
| -class Vad;
|
| -
|
| -class AudioEncoderCng final : public AudioEncoder {
|
| - public:
|
| - struct Config {
|
| - bool IsOk() const;
|
| -
|
| - int num_channels = 1;
|
| - int payload_type = 13;
|
| - // Caller keeps ownership of the AudioEncoder object.
|
| - AudioEncoder* speech_encoder = nullptr;
|
| - Vad::Aggressiveness vad_mode = Vad::kVadNormal;
|
| - int sid_frame_interval_ms = 100;
|
| - int num_cng_coefficients = 8;
|
| - // The Vad pointer is mainly for testing. If a NULL pointer is passed, the
|
| - // AudioEncoderCng creates (and destroys) a Vad object internally. If an
|
| - // object is passed, the AudioEncoderCng assumes ownership of the Vad
|
| - // object.
|
| - Vad* vad = nullptr;
|
| - };
|
| -
|
| - explicit AudioEncoderCng(const Config& config);
|
| - ~AudioEncoderCng() override;
|
| -
|
| - size_t MaxEncodedBytes() const override;
|
| - int SampleRateHz() const override;
|
| - int NumChannels() const override;
|
| - int RtpTimestampRateHz() const override;
|
| - size_t Num10MsFramesInNextPacket() const override;
|
| - size_t Max10MsFramesInAPacket() const override;
|
| - int GetTargetBitrate() const override;
|
| - EncodedInfo EncodeInternal(uint32_t rtp_timestamp,
|
| - rtc::ArrayView<const int16_t> audio,
|
| - size_t max_encoded_bytes,
|
| - uint8_t* encoded) override;
|
| - void Reset() override;
|
| - bool SetFec(bool enable) override;
|
| - bool SetDtx(bool enable) override;
|
| - bool SetApplication(Application application) override;
|
| - void SetMaxPlaybackRate(int frequency_hz) override;
|
| - void SetProjectedPacketLossRate(double fraction) override;
|
| - void SetTargetBitrate(int target_bps) override;
|
| -
|
| - private:
|
| - EncodedInfo EncodePassive(size_t frames_to_encode,
|
| - size_t max_encoded_bytes,
|
| - uint8_t* encoded);
|
| - EncodedInfo EncodeActive(size_t frames_to_encode,
|
| - size_t max_encoded_bytes,
|
| - uint8_t* encoded);
|
| - size_t SamplesPer10msFrame() const;
|
| -
|
| - AudioEncoder* speech_encoder_;
|
| - const int cng_payload_type_;
|
| - const int num_cng_coefficients_;
|
| - const int sid_frame_interval_ms_;
|
| - std::vector<int16_t> speech_buffer_;
|
| - std::vector<uint32_t> rtp_timestamps_;
|
| - bool last_frame_active_;
|
| - rtc::scoped_ptr<Vad> vad_;
|
| - rtc::scoped_ptr<CNG_enc_inst, CngInstDeleter> cng_inst_;
|
| -
|
| - RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderCng);
|
| -};
|
| -
|
| -} // namespace webrtc
|
| -
|
| -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_CNG_INCLUDE_AUDIO_ENCODER_CNG_H_
|
|
|