2011-07-07 08:21:25 +00:00
|
|
|
/*
|
2012-02-28 23:39:31 +00:00
|
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
2011-07-07 08:21:25 +00:00
|
|
|
*
|
|
|
|
|
* Use of this source code is governed by a BSD-style license
|
|
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
|
|
|
|
* in the file PATENTS. All contributing project authors may
|
|
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
|
|
|
*/
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "modules/video_coding/media_optimization.h"
|
2012-03-20 22:10:56 +00:00
|
|
|
|
2017-03-10 15:08:26 +01:00
|
|
|
#include <limits>
|
|
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "modules/video_coding/utility/frame_dropper.h"
|
|
|
|
|
#include "system_wrappers/include/clock.h"
|
2011-07-07 08:21:25 +00:00
|
|
|
|
|
|
|
|
namespace webrtc {
|
2013-03-04 15:24:40 +00:00
|
|
|
namespace media_optimization {
|
2017-11-08 11:33:37 +01:00
|
|
|
namespace {
|
|
|
|
|
const int64_t kFrameHistoryWinMs = 2000;
|
|
|
|
|
} // namespace
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2014-04-11 14:08:35 +00:00
|
|
|
MediaOptimization::MediaOptimization(Clock* clock)
|
2017-03-27 07:24:57 -07:00
|
|
|
: clock_(clock),
|
2013-09-23 19:54:25 +00:00
|
|
|
max_bit_rate_(0),
|
2017-11-08 11:33:37 +01:00
|
|
|
max_frame_rate_(0),
|
2013-09-24 07:41:53 +00:00
|
|
|
frame_dropper_(new FrameDropper),
|
2017-10-16 12:19:23 +02:00
|
|
|
incoming_frame_rate_(0) {
|
2013-09-23 19:54:25 +00:00
|
|
|
memset(incoming_frame_times_, -1, sizeof(incoming_frame_times_));
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-09-23 19:54:25 +00:00
|
|
|
MediaOptimization::~MediaOptimization(void) {}
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-12-19 10:59:48 +00:00
|
|
|
void MediaOptimization::Reset() {
|
2017-03-27 07:24:57 -07:00
|
|
|
rtc::CritScope lock(&crit_sect_);
|
2013-09-23 19:54:25 +00:00
|
|
|
memset(incoming_frame_times_, -1, sizeof(incoming_frame_times_));
|
|
|
|
|
incoming_frame_rate_ = 0.0;
|
|
|
|
|
frame_dropper_->Reset();
|
|
|
|
|
frame_dropper_->SetRates(0, 0);
|
2017-11-13 10:24:22 +01:00
|
|
|
max_bit_rate_ = 0;
|
2017-11-08 11:33:37 +01:00
|
|
|
max_frame_rate_ = 0;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2016-06-02 15:45:42 +02:00
|
|
|
void MediaOptimization::SetEncodingData(int32_t max_bit_rate,
|
2013-12-19 10:59:48 +00:00
|
|
|
uint32_t target_bitrate,
|
2017-11-08 11:33:37 +01:00
|
|
|
uint32_t max_frame_rate) {
|
2017-03-27 07:24:57 -07:00
|
|
|
rtc::CritScope lock(&crit_sect_);
|
2017-11-13 10:24:22 +01:00
|
|
|
// Everything codec specific should be reset here since the codec has changed.
|
2013-12-19 10:59:48 +00:00
|
|
|
max_bit_rate_ = max_bit_rate;
|
2017-11-08 11:33:37 +01:00
|
|
|
max_frame_rate_ = static_cast<float>(max_frame_rate);
|
2013-12-19 10:59:48 +00:00
|
|
|
float target_bitrate_kbps = static_cast<float>(target_bitrate) / 1000.0f;
|
|
|
|
|
frame_dropper_->Reset();
|
2017-11-08 11:33:37 +01:00
|
|
|
frame_dropper_->SetRates(target_bitrate_kbps, max_frame_rate_);
|
2013-12-19 10:59:48 +00:00
|
|
|
}
|
|
|
|
|
|
2016-12-08 02:19:40 -08:00
|
|
|
uint32_t MediaOptimization::SetTargetRates(uint32_t target_bitrate) {
|
2017-03-27 07:24:57 -07:00
|
|
|
rtc::CritScope lock(&crit_sect_);
|
2013-09-23 19:54:25 +00:00
|
|
|
|
2015-10-29 15:45:00 -07:00
|
|
|
// Cap target video bitrate to codec maximum.
|
2017-11-08 11:33:37 +01:00
|
|
|
int video_target_bitrate = target_bitrate;
|
|
|
|
|
if (max_bit_rate_ > 0 && video_target_bitrate > max_bit_rate_) {
|
|
|
|
|
video_target_bitrate = max_bit_rate_;
|
2015-10-29 15:45:00 -07:00
|
|
|
}
|
2013-09-23 19:54:25 +00:00
|
|
|
float target_video_bitrate_kbps =
|
2017-11-08 11:33:37 +01:00
|
|
|
static_cast<float>(video_target_bitrate) / 1000.0f;
|
2017-11-13 10:24:22 +01:00
|
|
|
|
2017-06-27 07:06:52 -07:00
|
|
|
float framerate = incoming_frame_rate_;
|
|
|
|
|
if (framerate == 0.0) {
|
|
|
|
|
// No framerate estimate available, use configured max framerate instead.
|
2017-11-08 11:33:37 +01:00
|
|
|
framerate = max_frame_rate_;
|
2017-06-27 07:06:52 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
frame_dropper_->SetRates(target_video_bitrate_kbps, framerate);
|
2013-09-23 19:54:25 +00:00
|
|
|
|
2017-11-08 11:33:37 +01:00
|
|
|
return video_target_bitrate;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-09-23 19:54:25 +00:00
|
|
|
uint32_t MediaOptimization::InputFrameRate() {
|
2017-03-27 07:24:57 -07:00
|
|
|
rtc::CritScope lock(&crit_sect_);
|
2014-06-30 08:01:47 +00:00
|
|
|
return InputFrameRateInternal();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
uint32_t MediaOptimization::InputFrameRateInternal() {
|
2013-09-23 19:54:25 +00:00
|
|
|
ProcessIncomingFrameRate(clock_->TimeInMilliseconds());
|
2017-03-10 15:08:26 +01:00
|
|
|
uint32_t framerate = static_cast<uint32_t>(std::min<float>(
|
|
|
|
|
std::numeric_limits<uint32_t>::max(), incoming_frame_rate_ + 0.5f));
|
|
|
|
|
return framerate;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2017-11-08 11:33:37 +01:00
|
|
|
void MediaOptimization::UpdateWithEncodedData(
|
Revert "Revert "Enables PeerConnectionFactory using external fec controller""
This reverts commit 00733015fafbbc61ddc12dfdc88b21a9fcd9d122.
Reason for revert: The reason for a downstream test failure on the original commit and a workaround has been found. Solution is to keep a PeerConnectionFactory constructor implementation as the same as before.
Original change's description:
> Revert "Enables PeerConnectionFactory using external fec controller"
>
> This reverts commit 4f07bdb25567d8ef528311e0b50a62c61d543fc3.
>
> Reason for revert: Speculatively reverting, because downstream test is now hitting "PeerConnectionFactory.initialize was not called before creating a PeerConnectionFactory" error, even though it did call initialize. I don't see how any change in this CL could cause that, but it's the only CL on the blamelist, and it does modify PeerConnectionFactory.java
>
> Original change's description:
> > Enables PeerConnectionFactory using external fec controller
> >
> > Bug: webrtc:8799
> > Change-Id: Ieb2cf6163b9a83844ab9ed4822b4a7f1db4c24b8
> > Reviewed-on: https://webrtc-review.googlesource.com/43961
> > Commit-Queue: Ying Wang <yinwa@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> > Reviewed-by: Niels Moller <nisse@webrtc.org>
> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#22038}
>
> TBR=sakal@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org,stefan@webrtc.org,yinwa@webrtc.org
>
> Change-Id: I95868c35d6f9973e0ebf563814cd71d0fcbd433d
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:8799
> Reviewed-on: https://webrtc-review.googlesource.com/54080
> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
> Commit-Queue: Taylor Brandstetter <deadbeef@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#22040}
TBR=deadbeef@webrtc.org,sakal@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org,stefan@webrtc.org,yinwa@webrtc.org
Bug: webrtc:8799
Change-Id: If9f3292bfcc739782967530c49f006d0abbc38a8
Reviewed-on: https://webrtc-review.googlesource.com/55400
Commit-Queue: Ying Wang <yinwa@webrtc.org>
Reviewed-by: Ying Wang <yinwa@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22100}
2018-02-20 12:50:27 +01:00
|
|
|
const size_t encoded_image_length,
|
|
|
|
|
const FrameType encoded_image_frametype) {
|
|
|
|
|
size_t encoded_length = encoded_image_length;
|
2017-03-27 07:24:57 -07:00
|
|
|
rtc::CritScope lock(&crit_sect_);
|
2013-09-23 19:54:25 +00:00
|
|
|
if (encoded_length > 0) {
|
Revert "Revert "Enables PeerConnectionFactory using external fec controller""
This reverts commit 00733015fafbbc61ddc12dfdc88b21a9fcd9d122.
Reason for revert: The reason for a downstream test failure on the original commit and a workaround has been found. Solution is to keep a PeerConnectionFactory constructor implementation as the same as before.
Original change's description:
> Revert "Enables PeerConnectionFactory using external fec controller"
>
> This reverts commit 4f07bdb25567d8ef528311e0b50a62c61d543fc3.
>
> Reason for revert: Speculatively reverting, because downstream test is now hitting "PeerConnectionFactory.initialize was not called before creating a PeerConnectionFactory" error, even though it did call initialize. I don't see how any change in this CL could cause that, but it's the only CL on the blamelist, and it does modify PeerConnectionFactory.java
>
> Original change's description:
> > Enables PeerConnectionFactory using external fec controller
> >
> > Bug: webrtc:8799
> > Change-Id: Ieb2cf6163b9a83844ab9ed4822b4a7f1db4c24b8
> > Reviewed-on: https://webrtc-review.googlesource.com/43961
> > Commit-Queue: Ying Wang <yinwa@webrtc.org>
> > Reviewed-by: Stefan Holmer <stefan@webrtc.org>
> > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> > Reviewed-by: Niels Moller <nisse@webrtc.org>
> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#22038}
>
> TBR=sakal@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org,stefan@webrtc.org,yinwa@webrtc.org
>
> Change-Id: I95868c35d6f9973e0ebf563814cd71d0fcbd433d
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:8799
> Reviewed-on: https://webrtc-review.googlesource.com/54080
> Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
> Commit-Queue: Taylor Brandstetter <deadbeef@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#22040}
TBR=deadbeef@webrtc.org,sakal@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org,stefan@webrtc.org,yinwa@webrtc.org
Bug: webrtc:8799
Change-Id: If9f3292bfcc739782967530c49f006d0abbc38a8
Reviewed-on: https://webrtc-review.googlesource.com/55400
Commit-Queue: Ying Wang <yinwa@webrtc.org>
Reviewed-by: Ying Wang <yinwa@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22100}
2018-02-20 12:50:27 +01:00
|
|
|
const bool delta_frame = encoded_image_frametype != kVideoFrameKey;
|
2013-09-23 19:54:25 +00:00
|
|
|
frame_dropper_->Fill(encoded_length, delta_frame);
|
|
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-09-23 19:54:25 +00:00
|
|
|
void MediaOptimization::EnableFrameDropper(bool enable) {
|
2017-03-27 07:24:57 -07:00
|
|
|
rtc::CritScope lock(&crit_sect_);
|
2013-09-23 19:54:25 +00:00
|
|
|
frame_dropper_->Enable(enable);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-09-23 19:54:25 +00:00
|
|
|
bool MediaOptimization::DropFrame() {
|
2017-03-27 07:24:57 -07:00
|
|
|
rtc::CritScope lock(&crit_sect_);
|
2013-12-19 10:59:48 +00:00
|
|
|
UpdateIncomingFrameRate();
|
2013-09-23 19:54:25 +00:00
|
|
|
// Leak appropriate number of bytes.
|
2014-06-30 08:01:47 +00:00
|
|
|
frame_dropper_->Leak((uint32_t)(InputFrameRateInternal() + 0.5f));
|
2013-09-23 19:54:25 +00:00
|
|
|
return frame_dropper_->DropFrame();
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
|
|
|
|
|
2013-09-23 19:54:25 +00:00
|
|
|
void MediaOptimization::UpdateIncomingFrameRate() {
|
|
|
|
|
int64_t now = clock_->TimeInMilliseconds();
|
|
|
|
|
if (incoming_frame_times_[0] == 0) {
|
|
|
|
|
// No shifting if this is the first time.
|
|
|
|
|
} else {
|
|
|
|
|
// Shift all times one step.
|
|
|
|
|
for (int32_t i = (kFrameCountHistorySize - 2); i >= 0; i--) {
|
|
|
|
|
incoming_frame_times_[i + 1] = incoming_frame_times_[i];
|
2013-05-29 16:33:46 +00:00
|
|
|
}
|
2013-09-23 19:54:25 +00:00
|
|
|
}
|
|
|
|
|
incoming_frame_times_[0] = now;
|
|
|
|
|
ProcessIncomingFrameRate(now);
|
|
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-09-23 19:54:25 +00:00
|
|
|
// Allowing VCM to keep track of incoming frame rate.
|
|
|
|
|
void MediaOptimization::ProcessIncomingFrameRate(int64_t now) {
|
|
|
|
|
int32_t num = 0;
|
|
|
|
|
int32_t nr_of_frames = 0;
|
|
|
|
|
for (num = 1; num < (kFrameCountHistorySize - 1); ++num) {
|
|
|
|
|
if (incoming_frame_times_[num] <= 0 ||
|
2017-08-07 00:03:03 -07:00
|
|
|
// Don't use data older than 2 s.
|
2013-09-23 19:54:25 +00:00
|
|
|
now - incoming_frame_times_[num] > kFrameHistoryWinMs) {
|
|
|
|
|
break;
|
|
|
|
|
} else {
|
|
|
|
|
nr_of_frames++;
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2013-09-23 19:54:25 +00:00
|
|
|
}
|
|
|
|
|
if (num > 1) {
|
2015-06-11 14:20:07 +02:00
|
|
|
const int64_t diff =
|
|
|
|
|
incoming_frame_times_[0] - incoming_frame_times_[num - 1];
|
|
|
|
|
incoming_frame_rate_ = 0.0; // No frame rate estimate available.
|
2013-09-23 19:54:25 +00:00
|
|
|
if (diff > 0) {
|
|
|
|
|
incoming_frame_rate_ = nr_of_frames * 1000.0f / static_cast<float>(diff);
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2013-09-23 19:54:25 +00:00
|
|
|
}
|
2011-07-07 08:21:25 +00:00
|
|
|
}
|
2013-03-04 15:24:40 +00:00
|
|
|
} // namespace media_optimization
|
|
|
|
|
} // namespace webrtc
|