Revert of Implement the NackModule as part of the new jitter buffer. (patchset #19 id:360001 of https://codereview.webrtc.org/1715673002/ )
Reason for revert: Unfortunately this breaks in the main waterfall: https://build.chromium.org/p/client.webrtc/builders/Android32%20Builder/builds/6362 I think it's related to dcheck_always_on=1 which is set in GYP_DEFINES only on the trybots, but not on the bots in the main waterfall. Original issue's description: > Implement the NackModule as part of the new jitter buffer. > > Things done/implemented in this CL: > - An interface that can send Nack (VCMNackSender). > - An interface that can request KeyFrames (VCMKeyFrameRequestSender). > - The nack module (NackModule). > - A set of convenience functions for modular numbers (mod_ops.h). > > BUG=webrtc:5514 > > Committed: https://crrev.com/f472c5b6722dfb221f929fc4d3a2b4ca54647701 > Cr-Commit-Position: refs/heads/master@{#11882} TBR=sprang@webrtc.org,stefan@webrtc.org,terelius@webrtc.org,torbjorng@webrtc.org,perkj@webrtc.org,tommi@webrtc.org,philipel@webrtc.org BUG=webrtc:5514 NOTRY=True Review URL: https://codereview.webrtc.org/1771883002 Cr-Commit-Position: refs/heads/master@{#11887}
This commit is contained in:
@ -11,8 +11,6 @@
|
||||
#ifndef WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_
|
||||
#define WEBRTC_MODULES_VIDEO_CODING_INCLUDE_VIDEO_CODING_DEFINES_H_
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include "webrtc/modules/include/module_common_types.h"
|
||||
#include "webrtc/typedefs.h"
|
||||
#include "webrtc/video_frame.h"
|
||||
@ -162,8 +160,6 @@ class VCMFrameTypeCallback {
|
||||
// Callback class used for telling the user about which packet sequence numbers
|
||||
// are currently
|
||||
// missing and need to be resent.
|
||||
// TODO(philipel): Deprecate VCMPacketRequestCallback
|
||||
// and use NackSender instead.
|
||||
class VCMPacketRequestCallback {
|
||||
public:
|
||||
virtual int32_t ResendPackets(const uint16_t* sequenceNumbers,
|
||||
@ -173,22 +169,6 @@ class VCMPacketRequestCallback {
|
||||
virtual ~VCMPacketRequestCallback() {}
|
||||
};
|
||||
|
||||
class NackSender {
|
||||
public:
|
||||
virtual void SendNack(const std::vector<uint16_t>& sequence_numbers) = 0;
|
||||
|
||||
protected:
|
||||
virtual ~NackSender() {}
|
||||
};
|
||||
|
||||
class KeyFrameRequestSender {
|
||||
public:
|
||||
virtual void RequestKeyFrame() = 0;
|
||||
|
||||
protected:
|
||||
virtual ~KeyFrameRequestSender() {}
|
||||
};
|
||||
|
||||
// Callback used to inform the user of the the desired resolution
|
||||
// as subscribed by Media Optimization (Quality Modes)
|
||||
class VCMQMSettingsCallback {
|
||||
|
||||
Reference in New Issue
Block a user