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
68 lines
1.7 KiB
C++
68 lines
1.7 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_AMR_H_
|
|
#define WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_AMR_H_
|
|
|
|
#include "webrtc/modules/audio_coding/main/acm2/acm_generic_codec.h"
|
|
|
|
// forward declaration
|
|
struct AMR_encinst_t_;
|
|
struct AMR_decinst_t_;
|
|
|
|
namespace webrtc {
|
|
|
|
enum ACMAMRPackingFormat;
|
|
|
|
namespace acm2 {
|
|
|
|
class ACMAMR : public ACMGenericCodec {
|
|
public:
|
|
ACMAMR(int16_t codec_id, bool enable_red);
|
|
~ACMAMR();
|
|
|
|
// for FEC
|
|
ACMGenericCodec* CreateInstance(void);
|
|
|
|
int16_t InternalEncode(uint8_t* bitstream, int16_t* bitstream_len_byte);
|
|
|
|
int16_t InternalInitEncoder(WebRtcACMCodecParams* codec_params);
|
|
|
|
int16_t SetAMREncoderPackingFormat(const ACMAMRPackingFormat packing_format);
|
|
|
|
ACMAMRPackingFormat AMREncoderPackingFormat() const;
|
|
|
|
int16_t SetAMRDecoderPackingFormat(const ACMAMRPackingFormat packing_format);
|
|
|
|
ACMAMRPackingFormat AMRDecoderPackingFormat() const;
|
|
|
|
protected:
|
|
void DestructEncoderSafe();
|
|
|
|
int16_t InternalCreateEncoder();
|
|
|
|
int16_t SetBitRateSafe(const int32_t rate);
|
|
|
|
int16_t EnableDTX();
|
|
|
|
int16_t DisableDTX();
|
|
|
|
AMR_encinst_t_* encoder_inst_ptr_;
|
|
int16_t encoding_mode_;
|
|
int16_t encoding_rate_;
|
|
ACMAMRPackingFormat encoder_packing_format_;
|
|
};
|
|
|
|
} // namespace acm2
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_MODULES_AUDIO_CODING_MAIN_ACM2_ACM_AMR_H_
|