From c095f510b6fb7a36131bd4e8c753c7e2c146faac Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Thu, 22 Aug 2013 12:34:58 +0000 Subject: [PATCH] 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@4593 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video_engine/test/common/fake_encoder.cc | 7 ++++--- webrtc/video_engine/test/common/fake_encoder.h | 4 +--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/webrtc/video_engine/test/common/fake_encoder.cc b/webrtc/video_engine/test/common/fake_encoder.cc index d9674b3bb5..cb9d79bfe5 100644 --- a/webrtc/video_engine/test/common/fake_encoder.cc +++ b/webrtc/video_engine/test/common/fake_encoder.cc @@ -60,11 +60,12 @@ int32_t FakeEncoder::Encode( 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(stream_bytes), sizeof(encoded_buffer_)); + if (static_cast(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/webrtc/video_engine/test/common/fake_encoder.h b/webrtc/video_engine/test/common/fake_encoder.h index 8a14f88231..e1272c749c 100644 --- a/webrtc/video_engine/test/common/fake_encoder.h +++ b/webrtc/video_engine/test/common/fake_encoder.h @@ -44,14 +44,12 @@ class FakeEncoder : public VideoEncoder { 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