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

24
webrtc/modules/video_render/video_render_frames.cc
View File

@ -18,9 +18,9 @@
namespace webrtc {
const WebRtc_Word32 KEventMaxWaitTimeMs = 200;
const WebRtc_UWord32 kMinRenderDelayMs = 10;
const WebRtc_UWord32 kMaxRenderDelayMs= 500;
const int32_t KEventMaxWaitTimeMs = 200;
const uint32_t kMinRenderDelayMs = 10;
const uint32_t kMaxRenderDelayMs= 500;
VideoRenderFrames::VideoRenderFrames()
: incoming_frames_(),
@ -31,8 +31,8 @@ VideoRenderFrames::~VideoRenderFrames() {
ReleaseAllFrames();
}
WebRtc_Word32 VideoRenderFrames::AddFrame(I420VideoFrame* new_frame) {
const WebRtc_Word64 time_now = TickTime::MillisecondTimestamp();
int32_t VideoRenderFrames::AddFrame(I420VideoFrame* new_frame) {
const int64_t time_now = TickTime::MillisecondTimestamp();
if (new_frame->render_time_ms() + KOldRenderTimestampMS < time_now) {
WEBRTC_TRACE(kTraceWarning, kTraceVideoRenderer, -1,
@ -119,7 +119,7 @@ I420VideoFrame* VideoRenderFrames::FrameToRender() {
return render_frame;
}
WebRtc_Word32 VideoRenderFrames::ReturnFrame(I420VideoFrame* old_frame) {
int32_t VideoRenderFrames::ReturnFrame(I420VideoFrame* old_frame) {
old_frame->ResetSize();
old_frame->set_timestamp(0);
old_frame->set_render_time_ms(0);
@ -127,7 +127,7 @@ WebRtc_Word32 VideoRenderFrames::ReturnFrame(I420VideoFrame* old_frame) {
return 0;
}
WebRtc_Word32 VideoRenderFrames::ReleaseAllFrames() {
int32_t VideoRenderFrames::ReleaseAllFrames() {
while (!incoming_frames_.Empty()) {
ListItem* item = incoming_frames_.First();
if (item) {
@ -149,8 +149,8 @@ WebRtc_Word32 VideoRenderFrames::ReleaseAllFrames() {
return 0;
}
WebRtc_UWord32 VideoRenderFrames::TimeToNextFrameRelease() {
WebRtc_Word64 time_to_release = 0;
uint32_t VideoRenderFrames::TimeToNextFrameRelease() {
int64_t time_to_release = 0;
ListItem* item = incoming_frames_.First();
if (item) {
I420VideoFrame* oldest_frame =
@ -163,11 +163,11 @@ WebRtc_UWord32 VideoRenderFrames::TimeToNextFrameRelease() {
} else {
time_to_release = KEventMaxWaitTimeMs;
}
return static_cast<WebRtc_UWord32>(time_to_release);
return static_cast<uint32_t>(time_to_release);
}
WebRtc_Word32 VideoRenderFrames::SetRenderDelay(
const WebRtc_UWord32 render_delay) {
int32_t VideoRenderFrames::SetRenderDelay(
const uint32_t render_delay) {
if (render_delay < kMinRenderDelayMs ||
render_delay > kMaxRenderDelayMs) {
WEBRTC_TRACE(kTraceWarning, kTraceVideoRenderer,