Use suffixed {uint,int}{8,16,32,64}_t types.
Removes the use of uint8, etc. in favor of uint8_t. BUG=webrtc:5024 R=henrik.lundin@webrtc.org, henrikg@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org Review URL: https://codereview.webrtc.org/1362503003 . Cr-Commit-Position: refs/heads/master@{#10196}
This commit is contained in:
@ -56,10 +56,10 @@ rtc::scoped_refptr<webrtc::VideoFrameBuffer> VideoFrameBufferForPixelBuffer(
|
||||
rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer =
|
||||
new rtc::RefCountedObject<webrtc::I420Buffer>(width, height);
|
||||
CVPixelBufferLockBaseAddress(pixel_buffer, kCVPixelBufferLock_ReadOnly);
|
||||
const uint8* src_y = reinterpret_cast<const uint8*>(
|
||||
const uint8_t* src_y = reinterpret_cast<const uint8_t*>(
|
||||
CVPixelBufferGetBaseAddressOfPlane(pixel_buffer, 0));
|
||||
int src_y_stride = CVPixelBufferGetBytesPerRowOfPlane(pixel_buffer, 0);
|
||||
const uint8* src_uv = reinterpret_cast<const uint8*>(
|
||||
const uint8_t* src_uv = reinterpret_cast<const uint8_t*>(
|
||||
CVPixelBufferGetBaseAddressOfPlane(pixel_buffer, 1));
|
||||
int src_uv_stride = CVPixelBufferGetBytesPerRowOfPlane(pixel_buffer, 1);
|
||||
int ret = libyuv::NV12ToI420(
|
||||
|
||||
@ -136,10 +136,10 @@ bool CopyVideoFrameToPixelBuffer(const webrtc::VideoFrame& frame,
|
||||
LOG(LS_ERROR) << "Failed to lock base address: " << cvRet;
|
||||
return false;
|
||||
}
|
||||
uint8* dst_y = reinterpret_cast<uint8*>(
|
||||
uint8_t* dst_y = reinterpret_cast<uint8_t*>(
|
||||
CVPixelBufferGetBaseAddressOfPlane(pixel_buffer, 0));
|
||||
int dst_stride_y = CVPixelBufferGetBytesPerRowOfPlane(pixel_buffer, 0);
|
||||
uint8* dst_uv = reinterpret_cast<uint8*>(
|
||||
uint8_t* dst_uv = reinterpret_cast<uint8_t*>(
|
||||
CVPixelBufferGetBaseAddressOfPlane(pixel_buffer, 1));
|
||||
int dst_stride_uv = CVPixelBufferGetBytesPerRowOfPlane(pixel_buffer, 1);
|
||||
// Convert I420 to NV12.
|
||||
|
||||
@ -123,7 +123,7 @@ bool H264CMSampleBufferToAnnexBBuffer(
|
||||
// Read the length of the next packet of data. Must convert from big endian
|
||||
// to host endian.
|
||||
RTC_DCHECK_GE(bytes_remaining, (size_t)nalu_header_size);
|
||||
uint32_t* uint32_data_ptr = reinterpret_cast<uint32*>(data_ptr);
|
||||
uint32_t* uint32_data_ptr = reinterpret_cast<uint32_t*>(data_ptr);
|
||||
uint32_t packet_size = CFSwapInt32BigToHost(*uint32_data_ptr);
|
||||
// Update buffer.
|
||||
annexb_buffer->AppendData(kAnnexBHeaderBytes, sizeof(kAnnexBHeaderBytes));
|
||||
|
||||
@ -848,7 +848,7 @@ class TestVp8Simulcast : public ::testing::Test {
|
||||
// 3rd stream: -1, -1, -1, -1, ....
|
||||
// Regarding the 3rd stream, note that a stream/encoder with 1 temporal layer
|
||||
// should always have temporal layer idx set to kNoTemporalIdx = -1.
|
||||
// Since CodecSpecificInfoVP8.temporalIdx is uint8, this will wrap to 255.
|
||||
// Since CodecSpecificInfoVP8.temporalIdx is uint8_t, this will wrap to 255.
|
||||
// TODO(marpan): Although this seems safe for now, we should fix this.
|
||||
void TestSpatioTemporalLayers321PatternEncoder() {
|
||||
int temporal_layer_profile[3] = {3, 2, 1};
|
||||
|
||||
@ -98,9 +98,9 @@ void Vp9FrameBufferPool::ClearPool() {
|
||||
}
|
||||
|
||||
// static
|
||||
int32 Vp9FrameBufferPool::VpxGetFrameBuffer(void* user_priv,
|
||||
size_t min_size,
|
||||
vpx_codec_frame_buffer* fb) {
|
||||
int32_t Vp9FrameBufferPool::VpxGetFrameBuffer(void* user_priv,
|
||||
size_t min_size,
|
||||
vpx_codec_frame_buffer* fb) {
|
||||
RTC_DCHECK(user_priv);
|
||||
RTC_DCHECK(fb);
|
||||
Vp9FrameBufferPool* pool = static_cast<Vp9FrameBufferPool*>(user_priv);
|
||||
@ -118,8 +118,8 @@ int32 Vp9FrameBufferPool::VpxGetFrameBuffer(void* user_priv,
|
||||
}
|
||||
|
||||
// static
|
||||
int32 Vp9FrameBufferPool::VpxReleaseFrameBuffer(void* user_priv,
|
||||
vpx_codec_frame_buffer* fb) {
|
||||
int32_t Vp9FrameBufferPool::VpxReleaseFrameBuffer(void* user_priv,
|
||||
vpx_codec_frame_buffer* fb) {
|
||||
RTC_DCHECK(user_priv);
|
||||
RTC_DCHECK(fb);
|
||||
Vp9FrameBuffer* buffer = static_cast<Vp9FrameBuffer*>(fb->priv);
|
||||
|
||||
@ -88,9 +88,9 @@ class Vp9FrameBufferPool {
|
||||
// |fb| Pointer to the libvpx frame buffer object, this is updated to
|
||||
// use the pool's buffer.
|
||||
// Returns 0 on success. Returns < 0 on failure.
|
||||
static int32 VpxGetFrameBuffer(void* user_priv,
|
||||
size_t min_size,
|
||||
vpx_codec_frame_buffer* fb);
|
||||
static int32_t VpxGetFrameBuffer(void* user_priv,
|
||||
size_t min_size,
|
||||
vpx_codec_frame_buffer* fb);
|
||||
|
||||
// InitializeVpxUsePool configures libvpx to call this function when it has
|
||||
// finished using one of the pool's frame buffer. Parameters:
|
||||
@ -98,8 +98,8 @@ class Vp9FrameBufferPool {
|
||||
// to be a pointer to the pool.
|
||||
// |fb| Pointer to the libvpx frame buffer object, its |priv| will be
|
||||
// a pointer to one of the pool's Vp9FrameBuffer.
|
||||
static int32 VpxReleaseFrameBuffer(void* user_priv,
|
||||
vpx_codec_frame_buffer* fb);
|
||||
static int32_t VpxReleaseFrameBuffer(void* user_priv,
|
||||
vpx_codec_frame_buffer* fb);
|
||||
|
||||
private:
|
||||
// Protects |allocated_buffers_|.
|
||||
|
||||
Reference in New Issue
Block a user