Moving encoded_bytes into EncodedInfo
BUG=3926
R=kwiberg@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/35469004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7883 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 615e428..27b9f2f 100644
--- a/webrtc/modules/audio_coding/codecs/audio_encoder.h
+++ b/webrtc/modules/audio_coding/codecs/audio_encoder.h
@@ -23,6 +23,9 @@
class AudioEncoder {
public:
struct EncodedInfo {
+ EncodedInfo() : encoded_bytes(0), encoded_timestamp(0), payload_type(0) {}
+
+ size_t encoded_bytes;
uint32_t encoded_timestamp;
int payload_type;
};
@@ -41,7 +44,6 @@
size_t num_samples_per_channel,
size_t max_encoded_bytes,
uint8_t* encoded,
- size_t* encoded_bytes,
EncodedInfo* info) {
CHECK_EQ(num_samples_per_channel,
static_cast<size_t>(sample_rate_hz() / 100));
@@ -49,9 +51,8 @@
audio,
max_encoded_bytes,
encoded,
- encoded_bytes,
info);
- CHECK_LE(*encoded_bytes, max_encoded_bytes);
+ CHECK_LE(info->encoded_bytes, max_encoded_bytes);
return ret;
}
@@ -76,7 +77,6 @@
const int16_t* audio,
size_t max_encoded_bytes,
uint8_t* encoded,
- size_t* encoded_bytes,
EncodedInfo* info) = 0;
};