zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove template usage of typeless enum in fake_encoder.

Browse Source 
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
This commit is contained in:
pbos@webrtc.org
2013-08-22 12:34:58 +00:00
parent 013d994583
commit c095f510b6
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/video_engine/test/common/fake_encoder.cc
View File

@ -60,11 +60,12 @@ int32_t FakeEncoder::Encode(
int stream_bits = (bits_available > max_stream_bits) ? max_stream_bits : int stream_bits = (bits_available > max_stream_bits) ? max_stream_bits :
bits_available; bits_available;
int stream_bytes = (stream_bits + 7) / 8; int stream_bytes = (stream_bits + 7) / 8;
EXPECT_LT(stream_bytes, kMaxFrameSizeBytes); EXPECT_LT(static_cast<size_t>(stream_bytes), sizeof(encoded_buffer_));
if (stream_bytes > kMaxFrameSizeBytes) if (static_cast<size_t>(stream_bytes) > sizeof(encoded_buffer_))
return -1; return -1;
EncodedImage encoded(encoded_buffer_, stream_bytes, kMaxFrameSizeBytes); EncodedImage encoded(
encoded_buffer_, stream_bytes, sizeof(encoded_buffer_));
encoded._timeStamp = input_image.timestamp(); encoded._timeStamp = input_image.timestamp();
encoded.capture_time_ms_ = input_image.render_time_ms(); encoded.capture_time_ms_ = input_image.render_time_ms();
if (min_stream_bits > bits_available) { if (min_stream_bits > bits_available) {

4
webrtc/video_engine/test/common/fake_encoder.h
View File

@ -44,14 +44,12 @@ class FakeEncoder : public VideoEncoder {
uint32_t framerate) OVERRIDE; uint32_t framerate) OVERRIDE;
private: private:
enum { kMaxFrameSizeBytes = 100000 };
Clock* clock_; Clock* clock_;
VideoCodec config_; VideoCodec config_;
EncodedImageCallback* callback_; EncodedImageCallback* callback_;
int target_bitrate_kbps_; int target_bitrate_kbps_;
int64_t last_encode_time_ms_; int64_t last_encode_time_ms_;
uint8_t encoded_buffer_[kMaxFrameSizeBytes]; uint8_t encoded_buffer_[100000];
}; };
} // namespace webrtc } // namespace webrtc