3154a1cf9d
This effectively reverts r8211. The problem with r8210 was that the change in constructor signature was not done for other codec selections that then default one. That is, some code that was hidden under #ifdef did not get updated. This is now fixed. BUG=4228 COAUTHOR=kwiberg@webrtc.org TBR=minyue@webrtc.org Review URL: https://webrtc-codereview.appspot.com/37879004 Cr-Commit-Position: refs/heads/master@{#8215} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8215 4adac7df-926f-26a2-2b94-8c16560cd09d
46 lines
1.3 KiB
C++
46 lines
1.3 KiB
C++
/*
|
|
* Copyright (c) 2012 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_MAIN_ACM2_ACM_PCMU_H_
|
|
#define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_PCMU_H_
|
|
|
|
#include "webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace acm2 {
|
|
|
|
class ACMPCMU : public ACMGenericCodec {
|
|
public:
|
|
ACMPCMU(int16_t codec_id, bool enable_red);
|
|
~ACMPCMU();
|
|
|
|
// For FEC.
|
|
ACMGenericCodec* CreateInstance(void);
|
|
|
|
int16_t InternalEncode(uint8_t* bitstream,
|
|
int16_t* bitstream_len_byte) OVERRIDE
|
|
EXCLUSIVE_LOCKS_REQUIRED(codec_wrapper_lock_);
|
|
|
|
int16_t InternalInitEncoder(WebRtcACMCodecParams* codec_params);
|
|
|
|
protected:
|
|
void DestructEncoderSafe() OVERRIDE
|
|
EXCLUSIVE_LOCKS_REQUIRED(codec_wrapper_lock_);
|
|
|
|
int16_t InternalCreateEncoder();
|
|
};
|
|
|
|
} // namespace acm2
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_PCMU_H_
|