generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build error in VCM tests from r219.

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/86001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@234 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
marpan@google.com 2011-07-19 19:56:40 +00:00
parent f1a7b4be25
commit b3916d54b0
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/modules/video_coding/main/test/media_opt_test.cc
View File

@ -555,6 +555,8 @@ MediaOptTest::TearDown()
VCMTestProtectionCallback::VCMTestProtectionCallback(): VCMTestProtectionCallback::VCMTestProtectionCallback():
_deltaFECRate(0), _deltaFECRate(0),
_keyFECRate(0), _keyFECRate(0),
_deltaUseUepProtection(0),
_keyUseUepProtection(0),
_nack(kNackOff) _nack(kNackOff)
{ {
// //
@ -566,10 +568,16 @@ VCMTestProtectionCallback::~VCMTestProtectionCallback()
} }
WebRtc_Word32 WebRtc_Word32
VCMTestProtectionCallback::ProtectionRequest(const WebRtc_UWord8 deltaFECRate, const WebRtc_UWord8 keyFECRate, const bool nack) VCMTestProtectionCallback::ProtectionRequest(const WebRtc_UWord8 deltaFECRate,
const WebRtc_UWord8 keyFECRate,
const bool deltaUseUepProtection,
const bool keyUseUepProtection,
const bool nack)
{ {
_deltaFECRate = deltaFECRate; _deltaFECRate = deltaFECRate;
_keyFECRate = keyFECRate; _keyFECRate = keyFECRate;
_deltaUseUepProtection = deltaUseUepProtection;
_keyUseUepProtection = keyUseUepProtection;
if (nack == true) if (nack == true)
{ {
_nack = kNackRtcp; _nack = kNackRtcp;
@ -599,6 +607,19 @@ VCMTestProtectionCallback::FECKeyRate()
return _keyFECRate; return _keyFECRate;
} }
bool
VCMTestProtectionCallback::FECDeltaUepProtection()
{
return _deltaUseUepProtection;
}
bool
VCMTestProtectionCallback::FECKeyUepProtection()
{
return _keyUseUepProtection;
}
void void
RTPFeedbackCallback::OnNetworkChanged(const WebRtc_Word32 id, RTPFeedbackCallback::OnNetworkChanged(const WebRtc_Word32 id,

10
src/modules/video_coding/main/test/media_opt_test.h
View File

@ -35,13 +35,21 @@ class VCMTestProtectionCallback: public webrtc::VCMProtectionCallback
public: public:
VCMTestProtectionCallback(); VCMTestProtectionCallback();
virtual ~VCMTestProtectionCallback(); virtual ~VCMTestProtectionCallback();
WebRtc_Word32 ProtectionRequest(const WebRtc_UWord8 deltaFECRate, const WebRtc_UWord8 keyFECRate, const bool nack); WebRtc_Word32 ProtectionRequest(const WebRtc_UWord8 deltaFECRate,
const WebRtc_UWord8 keyFECRate,
const bool deltaUseUepProtection,
const bool keyUseUepProtection,
const bool nack);
enum webrtc::NACKMethod NACKMethod(); enum webrtc::NACKMethod NACKMethod();
WebRtc_UWord8 FECDeltaRate(); WebRtc_UWord8 FECDeltaRate();
WebRtc_UWord8 FECKeyRate(); WebRtc_UWord8 FECKeyRate();
bool FECDeltaUepProtection();
bool FECKeyUepProtection();
private: private:
WebRtc_UWord8 _deltaFECRate; WebRtc_UWord8 _deltaFECRate;
WebRtc_UWord8 _keyFECRate; WebRtc_UWord8 _keyFECRate;
bool _deltaUseUepProtection;
bool _keyUseUepProtection;
enum webrtc::NACKMethod _nack; enum webrtc::NACKMethod _nack;
}; };