Fix build failure
There was a build failure due to including checks.h. Removed the include. TBR=kwiberg@webrtc.org Review URL: https://webrtc-codereview.appspot.com/48639004 Cr-Commit-Position: refs/heads/master@{#8825} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8825 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
a4bef3e6c0
commit
aa0bbab8ec
@ -15,7 +15,6 @@
|
|||||||
#include <algorithm> // sort
|
#include <algorithm> // sort
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "webrtc/base/checks.h"
|
|
||||||
#include "webrtc/base/format_macros.h"
|
#include "webrtc/base/format_macros.h"
|
||||||
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
|
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
|
||||||
#include "webrtc/common_types.h"
|
#include "webrtc/common_types.h"
|
||||||
@ -480,7 +479,7 @@ int32_t AcmReceiver::AddCodec(int acm_codec_id,
|
|||||||
uint8_t payload_type,
|
uint8_t payload_type,
|
||||||
int channels,
|
int channels,
|
||||||
AudioDecoder* audio_decoder) {
|
AudioDecoder* audio_decoder) {
|
||||||
CHECK_GE(acm_codec_id, 0);
|
assert(acm_codec_id >= 0);
|
||||||
NetEqDecoder neteq_decoder = ACMCodecDB::neteq_decoders_[acm_codec_id];
|
NetEqDecoder neteq_decoder = ACMCodecDB::neteq_decoders_[acm_codec_id];
|
||||||
|
|
||||||
// Make sure the right decoder is registered for Opus.
|
// Make sure the right decoder is registered for Opus.
|
||||||
@ -626,7 +625,7 @@ int AcmReceiver::LastAudioCodec(CodecInst* codec) const {
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
auto it = decoders_.find(last_audio_decoder_);
|
auto it = decoders_.find(last_audio_decoder_);
|
||||||
CHECK(it != decoders_.end());
|
assert(it != decoders_.end());
|
||||||
memcpy(codec, &ACMCodecDB::database_[last_audio_decoder_], sizeof(CodecInst));
|
memcpy(codec, &ACMCodecDB::database_[last_audio_decoder_], sizeof(CodecInst));
|
||||||
codec->pltype = it->second.payload_type;
|
codec->pltype = it->second.payload_type;
|
||||||
codec->channels = it->second.channels;
|
codec->channels = it->second.channels;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user