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

Switch from int64 to int64_t.

Browse Source 
The usage of int64 seems unintentional but it works because int64 is
defined here:
https://cs.chromium.org/chromium/src/third_party/libyuv/include/libyuv/basic_types.h?l=33&rcl=e1f6c1c0b57a9210bb95e88080fa171296210296

This CL switches to int64_t and aligns with the rest of the codebase.

Bug: None
Change-Id: I2292974dbca3692b570214d8bc790336219b151e
Reviewed-on: https://webrtc-review.googlesource.com/87700
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23894}
This commit is contained in:
Mirko Bonadei
2018-07-09 21:41:33 +02:00
committed by Commit Bot
parent b41b11bb99
commit 4d131e4eec
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/android/src/jni/androidmediadecoder.cc
View File

@ -442,7 +442,7 @@ int32_t MediaCodecVideoDecoder::DecodeOnCodecThread(
<< frames_received_ << ". Decoded: " << frames_decoded_; << frames_received_ << ". Decoded: " << frames_decoded_;
EnableFrameLogOnWarning(); EnableFrameLogOnWarning();
} }
const int64 drain_start = rtc::TimeMillis(); const int64_t drain_start = rtc::TimeMillis();
while ((frames_received_ > frames_decoded_ + max_pending_frames_) && while ((frames_received_ > frames_decoded_ + max_pending_frames_) &&
(rtc::TimeMillis() - drain_start) < kMediaCodecTimeoutMs) { (rtc::TimeMillis() - drain_start) < kMediaCodecTimeoutMs) {
if (!DeliverPendingOutputs(jni, kMediaCodecPollMs)) { if (!DeliverPendingOutputs(jni, kMediaCodecPollMs)) {