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

Side by Side Diff: webrtc/modules/utility/source/coder.h

Issue 1365283002: Remove AMR format parameter from AudioCoder in utility (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@acm-cleanup-typedefs.h
Patch Set: Created 5 years, 2 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
« no previous file with comments | « no previous file | webrtc/modules/utility/source/coder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "webrtc/base/scoped_ptr.h"
15 #include "webrtc/common_types.h" 15 #include "webrtc/common_types.h"
16 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h" 16 #include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
17 #include "webrtc/typedefs.h" 17 #include "webrtc/typedefs.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 class AudioFrame; 20 class AudioFrame;
21 21
22 class AudioCoder : public AudioPacketizationCallback 22 class AudioCoder : public AudioPacketizationCallback
23 { 23 {
24 public: 24 public:
25 AudioCoder(uint32_t instanceID); 25 AudioCoder(uint32_t instanceID);
26 ~AudioCoder(); 26 ~AudioCoder();
27 27
28 int32_t SetEncodeCodec( 28 int32_t SetEncodeCodec(const CodecInst& codecInst);
29 const CodecInst& codecInst,
30 ACMAMRPackingFormat amrFormat = AMRBandwidthEfficient);
31 29
32 int32_t SetDecodeCodec( 30 int32_t SetDecodeCodec(const CodecInst& codecInst);
33 const CodecInst& codecInst,
34 ACMAMRPackingFormat amrFormat = AMRBandwidthEfficient);
35 31
36 int32_t Decode(AudioFrame& decodedAudio, uint32_t sampFreqHz, 32 int32_t Decode(AudioFrame& decodedAudio, uint32_t sampFreqHz,
37 const int8_t* incomingPayload, size_t payloadLength); 33 const int8_t* incomingPayload, size_t payloadLength);
38 34
39 int32_t PlayoutData(AudioFrame& decodedAudio, uint16_t& sampFreqHz); 35 int32_t PlayoutData(AudioFrame& decodedAudio, uint16_t& sampFreqHz);
40 36
41 int32_t Encode(const AudioFrame& audio, int8_t* encodedData, 37 int32_t Encode(const AudioFrame& audio, int8_t* encodedData,
42 size_t& encodedLengthInBytes); 38 size_t& encodedLengthInBytes);
43 39
44 protected: 40 protected:
(...skipping 11 matching lines...) Expand all
56 52
57 uint32_t _encodeTimestamp; 53 uint32_t _encodeTimestamp;
58 int8_t* _encodedData; 54 int8_t* _encodedData;
59 size_t _encodedLengthInBytes; 55 size_t _encodedLengthInBytes;
60 56
61 uint32_t _decodeTimestamp; 57 uint32_t _decodeTimestamp;
62 }; 58 };
63 } // namespace webrtc 59 } // namespace webrtc
64 60
65 #endif // WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_ 61 #endif // WEBRTC_MODULES_UTILITY_SOURCE_CODER_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/utility/source/coder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698