Reland r8248 "Introduce ACMGenericCodecWrapper"
This effectively reverts r8249.
This new class inherits from ACMGenericCodec. The purpose is to wrap
AudioEncoder objects into an ACMGenericCodec interface. This is a
temporary construction that will be used during the ACM redesign work.
BUG=4228
COAUTHOR=kwiberg@webrtc.org
TBR=tina.legrand@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/38919004
Cr-Commit-Position: refs/heads/master@{#8255}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8255 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/codecs/audio_encoder.h b/webrtc/modules/audio_coding/codecs/audio_encoder.h
index 9b0c11b..6fc5827 100644
--- a/webrtc/modules/audio_coding/codecs/audio_encoder.h
+++ b/webrtc/modules/audio_coding/codecs/audio_encoder.h
@@ -14,7 +14,6 @@
#include <algorithm>
#include <vector>
-#include "webrtc/base/checks.h"
#include "webrtc/typedefs.h"
namespace webrtc {
@@ -63,14 +62,7 @@
size_t num_samples_per_channel,
size_t max_encoded_bytes,
uint8_t* encoded,
- EncodedInfo* info) {
- CHECK_EQ(num_samples_per_channel,
- static_cast<size_t>(sample_rate_hz() / 100));
- bool ret =
- EncodeInternal(rtp_timestamp, audio, max_encoded_bytes, encoded, info);
- CHECK_LE(info->encoded_bytes, max_encoded_bytes);
- return ret;
- }
+ EncodedInfo* info);
// Return the input sample rate in Hz and the number of input channels.
// These are constants set at instantiation time.