admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Propagate input capture time in ViEEncoder::OnFrame.

Browse Source 
BUG=webrtc:6977

Review-Url: https://codereview.webrtc.org/2763023002
Cr-Commit-Position: refs/heads/master@{#18351}
This commit is contained in:
nisse 2017-05-31 06:33:21 -07:00 committed by Commit Bot
parent 8b2b9efab6
commit 01d5a0b48d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/video_coding/generic_encoder.cc
View File

@ -126,7 +126,11 @@ int32_t VCMGenericEncoder::RequestFrame(
// TODO(nisse): Used only with internal source. Delete as soon as
// that feature is removed. The only implementation I've been able
// to find ignores what's in the frame.
// to find ignores what's in the frame. With one exception: It seems
// a few test cases, e.g.,
// VideoSendStreamTest.VideoSendStreamStopSetEncoderRateToZero, set
// internal_source to true and use FakeEncoder. And the latter will
// happily encode this 1x1 frame and pass it on down the pipeline.
return encoder_->Encode(VideoFrame(I420Buffer::Create(1, 1),
kVideoRotation_0, 0),
NULL, &frame_types);

1
webrtc/test/frame_generator_capturer.cc
View File

@ -160,6 +160,7 @@ void FrameGeneratorCapturer::InsertFrame() {
rtc::CritScope cs(&lock_);
if (sending_) {
VideoFrame* frame = frame_generator_->NextFrame();
frame->set_timestamp_us(rtc::TimeMicros());
frame->set_ntp_time_ms(clock_->CurrentNtpInMilliseconds());
frame->set_rotation(fake_rotation_);
if (first_frame_capture_time_ == -1) {

6
webrtc/video/vie_encoder.cc
View File

@ -587,11 +587,7 @@ void ViEEncoder::OnFrame(const VideoFrame& video_frame) {
VideoFrame incoming_frame = video_frame;
// Local time in webrtc time base.
int64_t current_time_us = clock_->TimeInMicroseconds();
int64_t current_time_ms = current_time_us / rtc::kNumMicrosecsPerMillisec;
// TODO(nisse): This always overrides the incoming timestamp. Don't
// do that, trust the frame source.
incoming_frame.set_timestamp_us(current_time_us);
int64_t current_time_ms = clock_->TimeInMilliseconds();
// Capture time may come from clock with an offset and drift from clock_.
int64_t capture_ntp_time_ms;