mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 13:50:40 +01:00
0dd1b0a4b2
This reverts commit00733015fa. 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 commit4f07bdb255. > > 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}
82 lines
2.7 KiB
C++
82 lines
2.7 KiB
C++
/*
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_
|
|
#define MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_
|
|
|
|
#include <memory>
|
|
|
|
#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"
|
|
|
|
namespace webrtc {
|
|
|
|
class Clock;
|
|
class FrameDropper;
|
|
|
|
namespace media_optimization {
|
|
|
|
class MediaOptimization {
|
|
public:
|
|
explicit MediaOptimization(Clock* clock);
|
|
~MediaOptimization();
|
|
|
|
// TODO(andresp): Can Reset and SetEncodingData be done at construction time
|
|
// only?
|
|
void Reset();
|
|
|
|
// Informs media optimization of initial encoding state.
|
|
// TODO(perkj): Deprecate SetEncodingData once its not used for stats in
|
|
// VideoStreamEncoder.
|
|
void SetEncodingData(int32_t max_bit_rate,
|
|
uint32_t bit_rate,
|
|
uint32_t max_frame_rate);
|
|
|
|
// Sets target rates for the encoder given the channel parameters.
|
|
// Input: |target bitrate| - the encoder target bitrate in bits/s.
|
|
uint32_t SetTargetRates(uint32_t target_bitrate);
|
|
|
|
void EnableFrameDropper(bool enable);
|
|
bool DropFrame();
|
|
|
|
// Informs Media Optimization of encoded output.
|
|
// TODO(perkj): Deprecate SetEncodingData once its not used for stats in
|
|
// VideoStreamEncoder.
|
|
void UpdateWithEncodedData(const size_t encoded_image_length,
|
|
const FrameType encoded_image_frametype);
|
|
|
|
// InputFrameRate 0 = no frame rate estimate available.
|
|
uint32_t InputFrameRate();
|
|
|
|
private:
|
|
enum { kFrameCountHistorySize = 90 };
|
|
|
|
void UpdateIncomingFrameRate() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
|
void ProcessIncomingFrameRate(int64_t now)
|
|
RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
|
uint32_t InputFrameRateInternal() RTC_EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
|
|
|
// Protect all members.
|
|
rtc::CriticalSection crit_sect_;
|
|
|
|
Clock* const clock_ RTC_GUARDED_BY(crit_sect_);
|
|
int32_t max_bit_rate_ RTC_GUARDED_BY(crit_sect_);
|
|
float max_frame_rate_ RTC_GUARDED_BY(crit_sect_);
|
|
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_);
|
|
};
|
|
} // namespace media_optimization
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CODING_MEDIA_OPTIMIZATION_H_
|