| OLD | NEW |
| 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_G722_AUDIO_ENCODER_G722_H_ | 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_ |
| 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_ | 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_ |
| 13 | 13 |
| 14 #include <memory> |
| 15 |
| 14 #include "webrtc/base/buffer.h" | 16 #include "webrtc/base/buffer.h" |
| 15 #include "webrtc/base/scoped_ptr.h" | |
| 16 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" | 17 #include "webrtc/modules/audio_coding/codecs/audio_encoder.h" |
| 17 #include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h" | 18 #include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h" |
| 18 | 19 |
| 19 namespace webrtc { | 20 namespace webrtc { |
| 20 | 21 |
| 21 struct CodecInst; | 22 struct CodecInst; |
| 22 | 23 |
| 23 class AudioEncoderG722 final : public AudioEncoder { | 24 class AudioEncoderG722 final : public AudioEncoder { |
| 24 public: | 25 public: |
| 25 struct Config { | 26 struct Config { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 44 EncodedInfo EncodeInternal(uint32_t rtp_timestamp, | 45 EncodedInfo EncodeInternal(uint32_t rtp_timestamp, |
| 45 rtc::ArrayView<const int16_t> audio, | 46 rtc::ArrayView<const int16_t> audio, |
| 46 size_t max_encoded_bytes, | 47 size_t max_encoded_bytes, |
| 47 uint8_t* encoded) override; | 48 uint8_t* encoded) override; |
| 48 void Reset() override; | 49 void Reset() override; |
| 49 | 50 |
| 50 private: | 51 private: |
| 51 // The encoder state for one channel. | 52 // The encoder state for one channel. |
| 52 struct EncoderState { | 53 struct EncoderState { |
| 53 G722EncInst* encoder; | 54 G722EncInst* encoder; |
| 54 rtc::scoped_ptr<int16_t[]> speech_buffer; // Queued up for encoding. | 55 std::unique_ptr<int16_t[]> speech_buffer; // Queued up for encoding. |
| 55 rtc::Buffer encoded_buffer; // Already encoded. | 56 rtc::Buffer encoded_buffer; // Already encoded. |
| 56 EncoderState(); | 57 EncoderState(); |
| 57 ~EncoderState(); | 58 ~EncoderState(); |
| 58 }; | 59 }; |
| 59 | 60 |
| 60 size_t SamplesPerChannel() const; | 61 size_t SamplesPerChannel() const; |
| 61 | 62 |
| 62 const size_t num_channels_; | 63 const size_t num_channels_; |
| 63 const int payload_type_; | 64 const int payload_type_; |
| 64 const size_t num_10ms_frames_per_packet_; | 65 const size_t num_10ms_frames_per_packet_; |
| 65 size_t num_10ms_frames_buffered_; | 66 size_t num_10ms_frames_buffered_; |
| 66 uint32_t first_timestamp_in_buffer_; | 67 uint32_t first_timestamp_in_buffer_; |
| 67 const rtc::scoped_ptr<EncoderState[]> encoders_; | 68 const std::unique_ptr<EncoderState[]> encoders_; |
| 68 rtc::Buffer interleave_buffer_; | 69 rtc::Buffer interleave_buffer_; |
| 69 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderG722); | 70 RTC_DISALLOW_COPY_AND_ASSIGN(AudioEncoderG722); |
| 70 }; | 71 }; |
| 71 | 72 |
| 72 } // namespace webrtc | 73 } // namespace webrtc |
| 73 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_ | 74 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_ENCODER_G722_H_ |
| OLD | NEW |