OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2011 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_UTILITY_SOURCE_CODER_H_ | 11 #ifndef WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_ |
12 #define WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_ | 12 #define WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_ |
13 | 13 |
14 #include "webrtc/base/scoped_ptr.h" | 14 #include <memory> |
15 | |
15 #include "webrtc/common_types.h" | 16 #include "webrtc/common_types.h" |
16 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" | 17 #include "webrtc/modules/audio_coding/include/audio_coding_module.h" |
17 #include "webrtc/typedefs.h" | 18 #include "webrtc/typedefs.h" |
18 | 19 |
19 namespace webrtc { | 20 namespace webrtc { |
20 class AudioFrame; | 21 class AudioFrame; |
21 | 22 |
22 class AudioCoder : public AudioPacketizationCallback | 23 class AudioCoder : public AudioPacketizationCallback |
23 { | 24 { |
24 public: | 25 public: |
(...skipping 14 matching lines...) Expand all Loading... | |
39 | 40 |
40 protected: | 41 protected: |
41 int32_t SendData(FrameType frameType, | 42 int32_t SendData(FrameType frameType, |
42 uint8_t payloadType, | 43 uint8_t payloadType, |
43 uint32_t timeStamp, | 44 uint32_t timeStamp, |
44 const uint8_t* payloadData, | 45 const uint8_t* payloadData, |
45 size_t payloadSize, | 46 size_t payloadSize, |
46 const RTPFragmentationHeader* fragmentation) override; | 47 const RTPFragmentationHeader* fragmentation) override; |
47 | 48 |
48 private: | 49 private: |
49 rtc::scoped_ptr<AudioCodingModule> _acm; | 50 std::unique_ptr<AudioCodingModule> _acm; |
tommi
2016/03/17 12:58:36
fix indent? (seems like it was off before too and
kwiberg-webrtc
2016/03/17 13:06:21
This file is a horrible mix of old and new code fo
| |
50 | 51 |
51 CodecInst _receiveCodec; | 52 CodecInst _receiveCodec; |
52 | 53 |
53 uint32_t _encodeTimestamp; | 54 uint32_t _encodeTimestamp; |
54 int8_t* _encodedData; | 55 int8_t* _encodedData; |
55 size_t _encodedLengthInBytes; | 56 size_t _encodedLengthInBytes; |
56 | 57 |
57 uint32_t _decodeTimestamp; | 58 uint32_t _decodeTimestamp; |
58 }; | 59 }; |
59 } // namespace webrtc | 60 } // namespace webrtc |
60 | 61 |
61 #endif // WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_ | 62 #endif // WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_ |
OLD | NEW |