6613f8e98a
This reverts commit 07276e4f89a93b1479d7aeefa53b4fc32daf001b. Reason for revert: Speculative revert due to downstream crashes. Original change's description: > Refactor and remove media_optimization::MediaOptimization. > > This CL removes MediaOptmization and folds some of its functionality > into VideoStreamEncoder. > > The FPS tracking is now handled by a RateStatistics instance. Frame > dropping is still handled by FrameDropper. Both of these now live > directly in VideoStreamEncoder. > There is no intended change in behavior from this CL, but due to a new > way of measuring frame rate, some minor perf changes can be expected. > > A small change in behavior is that OnBitrateUpdated is now called > directly rather than on the next frame. Since both encoding frame and > setting rate allocations happen on the encoder worker thread, there's > really no reason to cache bitrates and wait until the next frame. > An edge case though is that if a new bitrate is set before the first > frame, we must remember that bitrate and then apply it after the video > bitrate allocator has been first created. > > In addition to existing unit tests, manual tests have been used to > confirm that frame dropping works as expected with misbehaving encoders. > > Bug: webrtc:10164 > Change-Id: I7ee9c8d3c4f2bcf23c8c420310b05a4d35d94744 > Reviewed-on: https://webrtc-review.googlesource.com/c/115620 > Commit-Queue: Erik Språng <sprang@webrtc.org> > Reviewed-by: Niels Moller <nisse@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#26147} TBR=nisse@webrtc.org,sprang@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:10164 Change-Id: Ie0dae19dd012bc09e793c9661a45823fd760c20c Reviewed-on: https://webrtc-review.googlesource.com/c/116780 Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#26191}
79 lines
2.6 KiB
C++
79 lines
2.6 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 "modules/video_coding/utility/frame_dropper.h"
|
|
#include "rtc_base/criticalsection.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class Clock;
|
|
|
|
namespace media_optimization {
|
|
|
|
class MediaOptimization {
|
|
public:
|
|
explicit MediaOptimization(Clock* clock);
|
|
~MediaOptimization();
|
|
|
|
// 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_);
|
|
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_
|