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

Fix UpdateRect handling for native buffers in VideoStreamEncoder

Browse Source 
In Chrome we sometimes get frames with native handlers all the time.
To enable variable frame rate we need to trust at least empty updates.

Also, trust empty update rect when scaling.

Bug: webrtc:10310
Change-Id: I6087b66d5e6138290a7c143f85ba9bc427ae40a1
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126223
Reviewed-by: Johannes Kron <kron@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27021}
This commit is contained in:
Ilya Nikolaevskiy
2019-03-07 15:30:58 +01:00
committed by Commit Bot
parent 6f0aafa531
commit 1c90cab2ca
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
video/video_stream_encoder.cc
View File

@ -1177,7 +1177,12 @@ void VideoStreamEncoder::EncodeVideoFrame(const VideoFrame& video_frame,
} else {
cropped_buffer->ScaleFrom(
*video_frame.video_frame_buffer()->ToI420().get());
update_rect = VideoFrame::UpdateRect{0, 0, cropped_width, cropped_height};
if (!update_rect.IsEmpty()) {
// Since we can't reason about pixels after scaling, we invalidate whole
// picture, if anything changed.
update_rect =
VideoFrame::UpdateRect{0, 0, cropped_width, cropped_height};
}
}
out_frame = VideoFrame::Builder()
.set_video_frame_buffer(cropped_buffer)
@ -1250,15 +1255,22 @@ void VideoStreamEncoder::EncodeVideoFrame(const VideoFrame& video_frame,
return;
}
// UpdatedRect is not propagated because buffer was converted,
// therefore we can't guarantee that pixels outside of UpdateRect didn't
// change comparing to the previous frame.
// UpdatedRect is reset to full update if it's not empty, because buffer was
// converted, therefore we can't guarantee that pixels outside of UpdateRect
// didn't change comparing to the previous frame.
VideoFrame::UpdateRect update_rect =
out_frame.update_rect().IsEmpty()
? out_frame.update_rect()
: VideoFrame::UpdateRect{0, 0, out_frame.width(),
out_frame.height()};
out_frame = VideoFrame::Builder()
.set_video_frame_buffer(converted_buffer)
.set_timestamp_rtp(out_frame.timestamp())
.set_timestamp_ms(out_frame.render_time_ms())
.set_rotation(out_frame.rotation())
.set_id(out_frame.id())
.set_update_rect(update_rect)
.build();
}