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

Prevent zero-timestamps in captured_frame_.

Browse Source 
ViECapturer::OnIncomingCapturedFrame can abort if two frames without a
timestamp are delivered at the same time (the same NTP timestamp is
generated). This currently causes captured_frame_ to be in a state
where timestamps (NTP time etc.) are set, but RTP timestamp is not. This
is an issue if the previous frame in captured_frame_ has yet to be
picked up by the capturer thread, as it will pick up captured_frame_ in
a state where the RTP timestamp has not been set.

BUG=chromium:480953
R=magjed@webrtc.org, stefan@webrtc.org

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

Cr-Commit-Position: refs/heads/master@{#9094}
This commit is contained in:
Peter Boström
2015-04-28 10:48:43 +02:00
parent 143cec1cc6
commit 4a9cb6b67d
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
webrtc/video_engine/vie_capturer.cc
View File

@ -303,36 +303,39 @@ void ViECapturer::IncomingFrame(const I420VideoFrame& frame) {
void ViECapturer::OnIncomingCapturedFrame(const int32_t capture_id,
const I420VideoFrame& video_frame) {
CriticalSectionScoped cs(capture_cs_.get());
captured_frame_.ShallowCopy(video_frame);
I420VideoFrame incoming_frame = video_frame;
if (captured_frame_.ntp_time_ms() != 0) {
// If a ntp time stamp is set, this is the time stamp we will use.
captured_frame_.set_render_time_ms(
captured_frame_.ntp_time_ms() - delta_ntp_internal_ms_);
} else { // ntp time stamp not set.
int64_t render_time = captured_frame_.render_time_ms() != 0 ?
captured_frame_.render_time_ms() : TickTime::MillisecondTimestamp();
if (incoming_frame.ntp_time_ms() != 0) {
// If a NTP time stamp is set, this is the time stamp we will use.
incoming_frame.set_render_time_ms(
incoming_frame.ntp_time_ms() - delta_ntp_internal_ms_);
} else { // NTP time stamp not set.
int64_t render_time = incoming_frame.render_time_ms() != 0 ?
incoming_frame.render_time_ms() : TickTime::MillisecondTimestamp();
// Make sure we render this frame earlier since we know the render time set
// is slightly off since it's being set when the frame was received
// from the camera, and not when the camera actually captured the frame.
render_time -= FrameDelay();
captured_frame_.set_render_time_ms(render_time);
captured_frame_.set_ntp_time_ms(
incoming_frame.set_render_time_ms(render_time);
incoming_frame.set_ntp_time_ms(
render_time + delta_ntp_internal_ms_);
}
if (captured_frame_.ntp_time_ms() <= last_captured_timestamp_) {
// Convert NTP time, in ms, to RTP timestamp.
const int kMsToRtpTimestamp = 90;
incoming_frame.set_timestamp(kMsToRtpTimestamp *
static_cast<uint32_t>(incoming_frame.ntp_time_ms()));
CriticalSectionScoped cs(capture_cs_.get());
if (incoming_frame.ntp_time_ms() <= last_captured_timestamp_) {
// We don't allow the same capture time for two frames, drop this one.
LOG(LS_WARNING) << "Same/old NTP timestamp for incoming frame. Dropping.";
return;
}
last_captured_timestamp_ = captured_frame_.ntp_time_ms();
// Convert ntp time, in ms, to RTP timestamp.
const int kMsToRtpTimestamp = 90;
captured_frame_.set_timestamp(kMsToRtpTimestamp *
static_cast<uint32_t>(captured_frame_.ntp_time_ms()));
captured_frame_.ShallowCopy(incoming_frame);
last_captured_timestamp_ = incoming_frame.ntp_time_ms();
overuse_detector_->FrameCaptured(captured_frame_.width(),
captured_frame_.height(),