Remove unused NextFrame function from FrameBuffer.
Also updated FrameBuffer unittests to use the GlobalSimulatedTimeController. Bug: webrtc:7408, webrtc:9378 Change-Id: I8ade27492f66cdd8950b38f5f4a268714dbc35fc Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/164536 Reviewed-by: Sam Zackrisson <saza@webrtc.org> Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Commit-Queue: Philip Eliasson <philipel@webrtc.org> Cr-Commit-Position: refs/heads/master@{#30422}
This commit is contained in:
@ -58,14 +58,6 @@ class FrameBuffer {
|
||||
|
||||
// Get the next frame for decoding. Will return at latest after
|
||||
// |max_wait_time_ms|.
|
||||
// - If a frame is available within |max_wait_time_ms| it will return
|
||||
// kFrameFound and set |frame_out| to the resulting frame.
|
||||
// - If no frame is available after |max_wait_time_ms| it will return
|
||||
// kTimeout.
|
||||
// - If the FrameBuffer is stopped then it will return kStopped.
|
||||
ReturnReason NextFrame(int64_t max_wait_time_ms,
|
||||
std::unique_ptr<EncodedFrame>* frame_out,
|
||||
bool keyframe_required);
|
||||
void NextFrame(
|
||||
int64_t max_wait_time_ms,
|
||||
bool keyframe_required,
|
||||
@ -181,7 +173,6 @@ class FrameBuffer {
|
||||
int64_t latest_return_time_ms_ RTC_GUARDED_BY(crit_);
|
||||
bool keyframe_required_ RTC_GUARDED_BY(crit_);
|
||||
|
||||
rtc::Event new_continuous_frame_event_;
|
||||
VCMJitterEstimator jitter_estimator_ RTC_GUARDED_BY(crit_);
|
||||
VCMTiming* const timing_ RTC_GUARDED_BY(crit_);
|
||||
VCMInterFrameDelay inter_frame_delay_ RTC_GUARDED_BY(crit_);
|
||||
|
||||
Reference in New Issue
Block a user