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

WebRtc_Word32 -> int32_t in video_render/

Browse Source 
BUG=314

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3810 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-04-10 08:09:04 +00:00
parent b7192b8247
commit ddf94e71e5
39 changed files with 1273 additions and 1332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
webrtc/modules/video_render/test/testAPI/testAPI.cc
View File

@ -43,7 +43,7 @@
using namespace webrtc;
void GetTestVideoFrame(I420VideoFrame* frame,
WebRtc_UWord8 startColor);
uint8_t startColor);
int TestSingleStream(VideoRender* renderModule);
int TestFullscreenStream(VideoRender* &renderModule,
void* window,
@ -261,8 +261,8 @@ public:
{
}
;
virtual WebRtc_Word32 RenderFrame(const WebRtc_UWord32 streamId,
I420VideoFrame& videoFrame)
virtual int32_t RenderFrame(const uint32_t streamId,
I420VideoFrame& videoFrame)
{
_cnt++;
if (_cnt % 100 == 0)
@ -271,13 +271,13 @@ public:
}
return 0;
}
WebRtc_Word32 _cnt;
int32_t _cnt;
};
void GetTestVideoFrame(I420VideoFrame* frame,
WebRtc_UWord8 startColor) {
uint8_t startColor) {
// changing color
static WebRtc_UWord8 color = startColor;
static uint8_t color = startColor;
memset(frame->buffer(kYPlane), color, frame->allocated_size(kYPlane));
memset(frame->buffer(kUPlane), color, frame->allocated_size(kUPlane));
@ -316,7 +316,7 @@ int TestSingleStream(VideoRender* renderModule) {
I420VideoFrame videoFrame0;
videoFrame0.CreateEmptyFrame(width, height, width, half_width, half_width);
const WebRtc_UWord32 renderDelayMs = 500;
const uint32_t renderDelayMs = 500;
for (int i=0; i<TEST_FRAME_NUM; i++) {
GetTestVideoFrame(&videoFrame0, TEST_STREAM0_START_COLOR);
@ -374,7 +374,7 @@ int TestBitmapText(VideoRender* renderModule) {
0.3f);
printf("Adding Text\n");
renderModule->SetText(1, (WebRtc_UWord8*) "WebRtc Render Demo App", 20,
renderModule->SetText(1, (uint8_t*) "WebRtc Render Demo App", 20,
RGB(255, 0, 0), RGB(0, 0, 0), 0.25f, 0.1f, 1.0f,
1.0f);
@ -390,7 +390,7 @@ int TestBitmapText(VideoRender* renderModule) {
I420VideoFrame videoFrame0;
videoFrame0.CreateEmptyFrame(width, height, width, half_width, half_width);
const WebRtc_UWord32 renderDelayMs = 500;
const uint32_t renderDelayMs = 500;
for (int i=0; i<TEST_FRAME_NUM; i++) {
GetTestVideoFrame(&videoFrame0, TEST_STREAM0_START_COLOR);
@ -463,7 +463,7 @@ int TestMultipleStreams(VideoRender* renderModule) {
I420VideoFrame videoFrame3;
videoFrame3.CreateEmptyFrame(width, height, width, half_width, half_width);
const WebRtc_UWord32 renderDelayMs = 500;
const uint32_t renderDelayMs = 500;
// Render frames with the specified delay.
for (int i=0; i<TEST_FRAME_NUM; i++) {
@ -524,7 +524,7 @@ int TestExternalRender(VideoRender* renderModule) {
I420VideoFrame videoFrame0;
videoFrame0.CreateEmptyFrame(width, height, width, half_width, half_width);
const WebRtc_UWord32 renderDelayMs = 500;
const uint32_t renderDelayMs = 500;
int frameCount = TEST_FRAME_NUM;
for (int i=0; i<frameCount; i++) {
videoFrame0.set_render_time_ms(TickTime::MillisecondTimestamp() +