| Index: talk/media/base/videocapturer.h
|
| diff --git a/talk/media/base/videocapturer.h b/talk/media/base/videocapturer.h
|
| index dd89c441eb5fb426e5e0f11a478f1f5788b3ee7c..0a11ed09c1c9145f2ce565c52b451f51e53f0df6 100644
|
| --- a/talk/media/base/videocapturer.h
|
| +++ b/talk/media/base/videocapturer.h
|
| @@ -68,15 +68,15 @@ enum CaptureState {
|
| class VideoFrame;
|
|
|
| struct CapturedFrame {
|
| - static const uint32 kFrameHeaderSize = 40; // Size from width to data_size.
|
| - static const uint32 kUnknownDataSize = 0xFFFFFFFF;
|
| + static const uint32_t kFrameHeaderSize = 40; // Size from width to data_size.
|
| + static const uint32_t kUnknownDataSize = 0xFFFFFFFF;
|
|
|
| CapturedFrame();
|
|
|
| // Get the number of bytes of the frame data. If data_size is known, return
|
| // it directly. Otherwise, calculate the size based on width, height, and
|
| // fourcc. Return true if succeeded.
|
| - bool GetDataSize(uint32* size) const;
|
| + bool GetDataSize(uint32_t* size) const;
|
|
|
| // TODO(guoweis): Change the type of |rotation| from int to
|
| // webrtc::VideoRotation once chromium gets the code.
|
| @@ -85,16 +85,16 @@ struct CapturedFrame {
|
| // The width and height of the captured frame could be different from those
|
| // of VideoFormat. Once the first frame is captured, the width, height,
|
| // fourcc, pixel_width, and pixel_height should keep the same over frames.
|
| - int width; // in number of pixels
|
| - int height; // in number of pixels
|
| - uint32 fourcc; // compression
|
| - uint32 pixel_width; // width of a pixel, default is 1
|
| - uint32 pixel_height; // height of a pixel, default is 1
|
| + int width; // in number of pixels
|
| + int height; // in number of pixels
|
| + uint32_t fourcc; // compression
|
| + uint32_t pixel_width; // width of a pixel, default is 1
|
| + uint32_t pixel_height; // height of a pixel, default is 1
|
| // TODO(magjed): |elapsed_time| is deprecated - remove once not used anymore.
|
| - int64 elapsed_time;
|
| - int64 time_stamp; // timestamp of when the frame was captured, in unix
|
| - // time with nanosecond units.
|
| - uint32 data_size; // number of bytes of the frame data
|
| + int64_t elapsed_time;
|
| + int64_t time_stamp; // timestamp of when the frame was captured, in unix
|
| + // time with nanosecond units.
|
| + uint32_t data_size; // number of bytes of the frame data
|
|
|
| // TODO(guoweis): This can't be converted to VideoRotation yet as it's
|
| // used by chrome now.
|
| @@ -316,7 +316,7 @@ class VideoCapturer
|
|
|
| // subclasses override this virtual method to provide a vector of fourccs, in
|
| // order of preference, that are expected by the media engine.
|
| - virtual bool GetPreferredFourccs(std::vector<uint32>* fourccs) = 0;
|
| + virtual bool GetPreferredFourccs(std::vector<uint32_t>* fourccs) = 0;
|
|
|
| // mutators to set private attributes
|
| void SetId(const std::string& id) {
|
| @@ -341,8 +341,8 @@ class VideoCapturer
|
| // Get the distance between the desired format and the supported format.
|
| // Return the max distance if they mismatch. See the implementation for
|
| // details.
|
| - int64 GetFormatDistance(const VideoFormat& desired,
|
| - const VideoFormat& supported);
|
| + int64_t GetFormatDistance(const VideoFormat& desired,
|
| + const VideoFormat& supported);
|
|
|
| // Convert captured frame to readable string for LOG messages.
|
| std::string ToString(const CapturedFrame* frame) const;
|
|
|