| Index: talk/media/base/fakevideocapturer.h
|
| diff --git a/talk/media/base/fakevideocapturer.h b/talk/media/base/fakevideocapturer.h
|
| index 7bf8952e91b4c8d2d95b5057fae1776e3c152ead..a668ea7d0c937467a80ae4736530d3336ea41afc 100644
|
| --- a/talk/media/base/fakevideocapturer.h
|
| +++ b/talk/media/base/fakevideocapturer.h
|
| @@ -84,24 +84,24 @@ class FakeVideoCapturer : public cricket::VideoCapturer {
|
| GetCaptureFormat()->interval,
|
| GetCaptureFormat()->fourcc);
|
| }
|
| - bool CaptureCustomFrame(int width, int height, uint32 fourcc) {
|
| + bool CaptureCustomFrame(int width, int height, uint32_t fourcc) {
|
| // default to 30fps
|
| return CaptureCustomFrame(width, height, 33333333, fourcc);
|
| }
|
| bool CaptureCustomFrame(int width,
|
| int height,
|
| int64_t timestamp_interval,
|
| - uint32 fourcc) {
|
| + uint32_t fourcc) {
|
| if (!running_) {
|
| return false;
|
| }
|
| // Currently, |fourcc| is always I420 or ARGB.
|
| // TODO(fbarchard): Extend SizeOf to take fourcc.
|
| - uint32 size = 0u;
|
| + uint32_t size = 0u;
|
| if (fourcc == cricket::FOURCC_ARGB) {
|
| size = width * 4 * height;
|
| } else if (fourcc == cricket::FOURCC_I420) {
|
| - size = static_cast<uint32>(cricket::VideoFrame::SizeOf(width, height));
|
| + size = static_cast<uint32_t>(cricket::VideoFrame::SizeOf(width, height));
|
| } else {
|
| return false; // Unsupported FOURCC.
|
| }
|
| @@ -122,9 +122,9 @@ class FakeVideoCapturer : public cricket::VideoCapturer {
|
| // Copy something non-zero into the buffer so Validate wont complain that
|
| // the frame is all duplicate.
|
| memset(frame.data, 1, size / 2);
|
| - memset(reinterpret_cast<uint8*>(frame.data) + (size / 2), 2,
|
| - size - (size / 2));
|
| - memcpy(frame.data, reinterpret_cast<const uint8*>(&fourcc), 4);
|
| + memset(reinterpret_cast<uint8_t*>(frame.data) + (size / 2), 2,
|
| + size - (size / 2));
|
| + memcpy(frame.data, reinterpret_cast<const uint8_t*>(&fourcc), 4);
|
| frame.rotation = rotation_;
|
| // TODO(zhurunz): SignalFrameCaptured carry returned value to be able to
|
| // capture results from downstream.
|
| @@ -157,7 +157,7 @@ class FakeVideoCapturer : public cricket::VideoCapturer {
|
| is_screencast_ = is_screencast;
|
| }
|
| virtual bool IsScreencast() const { return is_screencast_; }
|
| - bool GetPreferredFourccs(std::vector<uint32>* fourccs) {
|
| + bool GetPreferredFourccs(std::vector<uint32_t>* fourccs) {
|
| fourccs->push_back(cricket::FOURCC_I420);
|
| fourccs->push_back(cricket::FOURCC_MJPG);
|
| return true;
|
| @@ -171,8 +171,8 @@ class FakeVideoCapturer : public cricket::VideoCapturer {
|
|
|
| private:
|
| bool running_;
|
| - int64 initial_unix_timestamp_;
|
| - int64 next_timestamp_;
|
| + int64_t initial_unix_timestamp_;
|
| + int64_t next_timestamp_;
|
| bool is_screencast_;
|
| webrtc::VideoRotation rotation_;
|
| };
|
|
|