Remove template usage of typeless enum in fake_encoder.
Removes clang warning preventing compile.
BUG=
R=stefan@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2087005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4593 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/video_engine/test/common/fake_encoder.cc b/video_engine/test/common/fake_encoder.cc
index d9674b3..cb9d79b 100644
--- a/video_engine/test/common/fake_encoder.cc
+++ b/video_engine/test/common/fake_encoder.cc
@@ -60,11 +60,12 @@
int stream_bits = (bits_available > max_stream_bits) ? max_stream_bits :
bits_available;
int stream_bytes = (stream_bits + 7) / 8;
- EXPECT_LT(stream_bytes, kMaxFrameSizeBytes);
- if (stream_bytes > kMaxFrameSizeBytes)
+ EXPECT_LT(static_cast<size_t>(stream_bytes), sizeof(encoded_buffer_));
+ if (static_cast<size_t>(stream_bytes) > sizeof(encoded_buffer_))
return -1;
- EncodedImage encoded(encoded_buffer_, stream_bytes, kMaxFrameSizeBytes);
+ EncodedImage encoded(
+ encoded_buffer_, stream_bytes, sizeof(encoded_buffer_));
encoded._timeStamp = input_image.timestamp();
encoded.capture_time_ms_ = input_image.render_time_ms();
if (min_stream_bits > bits_available) {
diff --git a/video_engine/test/common/fake_encoder.h b/video_engine/test/common/fake_encoder.h
index 8a14f88..e1272c7 100644
--- a/video_engine/test/common/fake_encoder.h
+++ b/video_engine/test/common/fake_encoder.h
@@ -44,14 +44,12 @@
uint32_t framerate) OVERRIDE;
private:
- enum { kMaxFrameSizeBytes = 100000 };
-
Clock* clock_;
VideoCodec config_;
EncodedImageCallback* callback_;
int target_bitrate_kbps_;
int64_t last_encode_time_ms_;
- uint8_t encoded_buffer_[kMaxFrameSizeBytes];
+ uint8_t encoded_buffer_[100000];
};
} // namespace webrtc
