admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WebRtc_Word32 -> int32_t in common_video.

Browse Source 
BUG=314

Review URL: https://webrtc-codereview.appspot.com/1300004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3798 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2013-04-09 13:36:08 +00:00
parent c75102eba7
commit fd2bfc8fca
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/common_video/interface/video_image.h
View File

@ -40,9 +40,9 @@ public:
_size(0),
_completeFrame(false) {}
EncodedImage(WebRtc_UWord8* buffer,
WebRtc_UWord32 length,
WebRtc_UWord32 size)
EncodedImage(uint8_t* buffer,
uint32_t length,
uint32_t size)
: _encodedWidth(0),
_encodedHeight(0),
_timeStamp(0),
@ -53,14 +53,14 @@ public:
_size(size),
_completeFrame(false) {}
WebRtc_UWord32 _encodedWidth;
WebRtc_UWord32 _encodedHeight;
WebRtc_UWord32 _timeStamp;
int64_t capture_time_ms_;
uint32_t _encodedWidth;
uint32_t _encodedHeight;
uint32_t _timeStamp;
int64_t capture_time_ms_;
VideoFrameType _frameType;
WebRtc_UWord8* _buffer;
WebRtc_UWord32 _length;
WebRtc_UWord32 _size;
uint8_t* _buffer;
uint32_t _length;
uint32_t _size;
bool _completeFrame;
};

4
webrtc/common_video/jpeg/include/jpeg.h
View File

@ -36,7 +36,7 @@ public:
// Output:
// - 0 : OK
// - (-1) : Error
WebRtc_Word32 SetFileName(const char* fileName);
int32_t SetFileName(const char* fileName);
// Encode an I420 image. The encoded image is saved to a file
//
@ -46,7 +46,7 @@ public:
// Output:
// - 0 : OK
// - (-1) : Error
WebRtc_Word32 Encode(const I420VideoFrame& inputImage);
int32_t Encode(const I420VideoFrame& inputImage);
private:

12
webrtc/common_video/jpeg/jpeg.cc
View File

@ -66,7 +66,7 @@ JpegEncoder::~JpegEncoder()
}
WebRtc_Word32
int32_t
JpegEncoder::SetFileName(const char* fileName)
{
if (!fileName)
@ -83,7 +83,7 @@ JpegEncoder::SetFileName(const char* fileName)
}
WebRtc_Word32
int32_t
JpegEncoder::Encode(const I420VideoFrame& inputImage)
{
if (inputImage.IsZeroSize())
@ -148,14 +148,14 @@ JpegEncoder::Encode(const I420VideoFrame& inputImage)
scoped_array<uint8_t> image_buffer(new uint8_t[length]);
ExtractBuffer(inputImage, length, image_buffer.get());
int height16 = (height + 15) & ~15;
WebRtc_UWord8* imgPtr = image_buffer.get();
uint8_t* imgPtr = image_buffer.get();
WebRtc_UWord8* origImagePtr = NULL;
uint8_t* origImagePtr = NULL;
if (height16 != height)
{
// Copy image to an adequate size buffer
WebRtc_UWord32 requiredSize = CalcBufferSize(kI420, width, height16);
origImagePtr = new WebRtc_UWord8[requiredSize];
uint32_t requiredSize = CalcBufferSize(kI420, width, height16);
origImagePtr = new uint8_t[requiredSize];
memset(origImagePtr, 0, requiredSize);
memcpy(origImagePtr, image_buffer.get(), length);
imgPtr = origImagePtr;

2
webrtc/common_video/jpeg/jpeg_unittest.cc
View File

@ -54,7 +54,7 @@ class JpegTest: public testing::Test {
assert(open_file != NULL);
size_t length = webrtc::test::GetFileSize(input_filename);
EncodedImage* encoded_buffer = new EncodedImage();
encoded_buffer->_buffer = new WebRtc_UWord8[length];
encoded_buffer->_buffer = new uint8_t[length];
encoded_buffer->_size = length;
encoded_buffer->_length = length;
if (fread(encoded_buffer->_buffer, 1, length, open_file) != length) {