2011-07-07 08:21:25 +00:00
|
|
|
/*
|
2012-01-23 14:56:14 +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
|
|
|
#ifndef MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_
|
|
|
|
|
#define MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_
|
2013-09-23 19:54:25 +00:00
|
|
|
|
2016-02-29 05:51:59 -08:00
|
|
|
#include <memory>
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "modules/include/module_common_types.h"
|
|
|
|
|
#include "modules/video_coding/include/video_coding.h"
|
|
|
|
|
#include "modules/video_coding/media_opt_util.h"
|
|
|
|
|
#include "rtc_base/criticalsection.h"
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-03-04 15:24:40 +00:00
|
|
|
namespace webrtc {
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-01-21 07:42:11 +00:00
|
|
|
class Clock;
|
2013-02-18 14:40:18 +00:00
|
|
|
class FrameDropper;
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-03-04 15:24:40 +00:00
|
|
|
namespace media_optimization {
|
|
|
|
|
|
2013-09-23 19:54:25 +00:00
|
|
|
class MediaOptimization {
|
|
|
|
|
public:
|
2014-04-11 14:08:35 +00:00
|
|
|
explicit MediaOptimization(Clock* clock);
|
2013-12-19 10:59:48 +00:00
|
|
|
~MediaOptimization();
|
|
|
|
|
|
|
|
|
|
// TODO(andresp): Can Reset and SetEncodingData be done at construction time
|
|
|
|
|
// only?
|
|
|
|
|
void Reset();
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2013-12-19 10:59:48 +00:00
|
|
|
// Informs media optimization of initial encoding state.
|
2016-06-02 15:45:42 +02:00
|
|
|
// TODO(perkj): Deprecate SetEncodingData once its not used for stats in
|
2017-11-08 11:33:37 +01:00
|
|
|
// VideoStreamEncoder.
|
2016-06-02 15:45:42 +02:00
|
|
|
void SetEncodingData(int32_t max_bit_rate,
|
2013-12-19 10:59:48 +00:00
|
|
|
uint32_t bit_rate,
|
2017-11-08 11:33:37 +01:00
|
|
|
uint32_t max_frame_rate);
|
2013-09-23 19:54:25 +00:00
|
|
|
|
|
|
|
|
// Sets target rates for the encoder given the channel parameters.
|
2017-08-07 00:03:03 -07:00
|
|
|
// Input: |target bitrate| - the encoder target bitrate in bits/s.
|
2016-12-08 02:19:40 -08:00
|
|
|
uint32_t SetTargetRates(uint32_t target_bitrate);
|
2013-09-23 19:54:25 +00:00
|
|
|
|
2013-12-19 10:59:48 +00:00
|
|
|
void EnableFrameDropper(bool enable);
|
|
|
|
|
bool DropFrame();
|
2013-09-23 19:54:25 +00:00
|
|
|
|
2014-12-01 15:23:21 +00:00
|
|
|
// Informs Media Optimization of encoded output.
|
2016-06-02 15:45:42 +02:00
|
|
|
// TODO(perkj): Deprecate SetEncodingData once its not used for stats in
|
2017-11-08 11:33:37 +01:00
|
|
|
// VideoStreamEncoder.
|
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
|
|
|
void UpdateWithEncodedData(const size_t encoded_image_length,
|
|
|
|
|
const FrameType encoded_image_frametype);
|
2013-09-23 19:54:25 +00:00
|
|
|
|
2015-06-11 14:20:07 +02:00
|
|
|
// InputFrameRate 0 = no frame rate estimate available.
|
2013-12-19 10:59:48 +00:00
|
|
|
uint32_t InputFrameRate();
|
2013-09-23 19:54:25 +00:00
|
|
|
|
|
|
|
|
private:
|
2015-12-21 04:12:39 -08:00
|
|
|
enum { kFrameCountHistorySize = 90 };
|
2013-09-23 19:54:25 +00:00
|
|
|
|
2017-09-07 07:53:45 -07:00
|
|
|
void UpdateIncomingFrameRate() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
2014-06-30 08:01:47 +00:00
|
|
|
void ProcessIncomingFrameRate(int64_t now)
|
2017-09-07 07:53:45 -07:00
|
|
|
RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
|
|
|
|
uint32_t InputFrameRateInternal() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
2014-06-30 08:01:47 +00:00
|
|
|
|
|
|
|
|
// Protect all members.
|
2017-03-27 07:24:57 -07:00
|
|
|
rtc::CriticalSection crit_sect_;
|
2014-06-30 08:01:47 +00:00
|
|
|
|
2017-11-08 11:33:37 +01:00
|
|
|
Clock* const clock_ RTC_GUARDED_BY(crit_sect_);
|
2017-09-07 07:53:45 -07:00
|
|
|
int32_t max_bit_rate_ RTC_GUARDED_BY(crit_sect_);
|
2017-11-08 11:33:37 +01:00
|
|
|
float max_frame_rate_ RTC_GUARDED_BY(crit_sect_);
|
2017-09-07 07:53:45 -07:00
|
|
|
std::unique_ptr<FrameDropper> frame_dropper_ RTC_GUARDED_BY(crit_sect_);
|
|
|
|
|
float incoming_frame_rate_ RTC_GUARDED_BY(crit_sect_);
|
|
|
|
|
int64_t incoming_frame_times_[kFrameCountHistorySize] RTC_GUARDED_BY(
|
|
|
|
|
crit_sect_);
|
2013-12-19 10:59:48 +00:00
|
|
|
};
|
2013-03-04 15:24:40 +00:00
|
|
|
} // namespace media_optimization
|
|
|
|
|
} // namespace webrtc
|
2011-07-07 08:21:25 +00:00
|
|
|
|
2017-09-15 06:47:31 +02:00
|
|
|
#endif // MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_
|