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

Fill drops with last decoded frame.

Browse Source 
Fill drops with last decoded frame to make them look like freeze at
playback and to keep decoded spatial layers in sync.

Bug: none
Change-Id: I65f7c21100985c22932a1edd441b6c724833c11e
Reviewed-on: https://webrtc-review.googlesource.com/73685
Commit-Queue: Sergey Silkin <ssilkin@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23076}
This commit is contained in:
Sergey Silkin 2018-05-02 10:50:55 +02:00 committed by Commit Bot
parent 2f2633d90c
commit 5613879b7b
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/video_coding/codecs/test/videoprocessor.cc
View File

@ -181,6 +181,7 @@ VideoProcessor::VideoProcessor(webrtc::VideoEncoder* encoder,
last_encoded_frame_num_(num_simulcast_or_spatial_layers_),
first_decoded_frame_(num_simulcast_or_spatial_layers_, true),
last_decoded_frame_num_(num_simulcast_or_spatial_layers_),
decoded_frame_buffer_(num_simulcast_or_spatial_layers_),
post_encode_time_ns_(0) {
// Sanity checks.
RTC_CHECK(rtc::TaskQueue::Current())
@ -429,6 +430,16 @@ void VideoProcessor::FrameDecoded(const VideoFrame& decoded_frame,
stats_->GetFrameWithTimestamp(decoded_frame.timestamp(), spatial_idx);
const size_t frame_number = frame_stat->frame_number;
if (decoded_frame_writers_ && !first_decoded_frame_[spatial_idx]) {
// Fill drops with last decoded frame to make them look like freeze at
// playback and to keep decoded layers in sync.
for (size_t i = last_decoded_frame_num_[spatial_idx] + 1; i < frame_number;
++i) {
RTC_CHECK(decoded_frame_writers_->at(spatial_idx)
->WriteFrame(decoded_frame_buffer_[spatial_idx].data()));
}
}
// Ensure that the decode order is monotonically increasing, within this
// simulcast/spatial layer.
RTC_CHECK(first_decoded_frame_[spatial_idx] ||
@ -469,11 +480,12 @@ void VideoProcessor::FrameDecoded(const VideoFrame& decoded_frame,
if (decoded_frame_writers_) {
ExtractI420BufferWithSize(decoded_frame, config_.codec_settings.width,
config_.codec_settings.height, &tmp_i420_buffer_);
RTC_CHECK_EQ(tmp_i420_buffer_.size(),
config_.codec_settings.height,
&decoded_frame_buffer_[spatial_idx]);
RTC_CHECK_EQ(decoded_frame_buffer_[spatial_idx].size(),
decoded_frame_writers_->at(spatial_idx)->FrameLength());
RTC_CHECK(decoded_frame_writers_->at(spatial_idx)
->WriteFrame(tmp_i420_buffer_.data()));
->WriteFrame(decoded_frame_buffer_[spatial_idx].data()));
}
}

4
modules/video_coding/codecs/test/videoprocessor.h
View File

@ -221,7 +221,6 @@ class VideoProcessor {
// and decoded bitstreams. Each frame writer is enabled by being non-null.
IvfFileWriterList* const encoded_frame_writers_;
FrameWriterList* const decoded_frame_writers_;
rtc::Buffer tmp_i420_buffer_; // Temp storage for format conversion.
// Metadata for inputed/encoded/decoded frames. Used for frame identification,
// frame drop detection, etc. We assume that encoded/decoded frames are
@ -237,6 +236,9 @@ class VideoProcessor {
std::vector<bool> first_decoded_frame_ RTC_GUARDED_BY(sequence_checker_);
// simulcast_svc_idx -> frame_number.
std::vector<size_t> last_decoded_frame_num_ RTC_GUARDED_BY(sequence_checker_);
// simulcast_svc_idx -> buffer.
std::vector<rtc::Buffer> decoded_frame_buffer_
RTC_GUARDED_BY(sequence_checker_);
// Time spent in frame encode callback. It is accumulated for layers and
// reset when frame encode starts. When next layer is encoded post-encode time