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

Make EncoderStateFeedbackObserver prototypes consistent.

Browse Source 
TBR=mflodman
Review URL: https://webrtc-codereview.appspot.com/824006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2797 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2012-09-20 23:33:17 +00:00
parent bed540a90c
commit 9663686546
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/rtp_rtcp/interface/rtp_rtcp_defines.h
View File

@ -211,13 +211,13 @@ class RtpAudioFeedback {
class RtcpIntraFrameObserver {
public:
virtual void OnReceivedIntraFrameRequest(const uint32_t ssrc) = 0;
virtual void OnReceivedIntraFrameRequest(uint32_t ssrc) = 0;
virtual void OnReceivedSLI(const uint32_t ssrc,
const uint8_t picture_id) = 0;
virtual void OnReceivedSLI(uint32_t ssrc,
uint8_t picture_id) = 0;
virtual void OnReceivedRPSI(const uint32_t ssrc,
const uint64_t picture_id) = 0;
virtual void OnReceivedRPSI(uint32_t ssrc,
uint64_t picture_id) = 0;
virtual ~RtcpIntraFrameObserver() {}
};

12
src/modules/rtp_rtcp/test/testAPI/test_api_rtcp.cc
View File

@ -19,7 +19,7 @@
#include "rtp_rtcp_defines.h"
using namespace webrtc;
const uint64_t kTestPictureId = 12345678;
class RtcpCallback : public RtcpFeedback, public RtcpIntraFrameObserver {
@ -58,14 +58,14 @@ class RtcpCallback : public RtcpFeedback, public RtcpIntraFrameObserver {
virtual void OnReceiveReportReceived(const WebRtc_Word32 id,
const WebRtc_UWord32 senderSSRC) {
};
virtual void OnReceivedIntraFrameRequest(const uint32_t ssrc) {
virtual void OnReceivedIntraFrameRequest(uint32_t ssrc) {
};
virtual void OnReceivedSLI(const uint32_t ssrc,
const uint8_t pictureId) {
virtual void OnReceivedSLI(uint32_t ssrc,
uint8_t pictureId) {
EXPECT_EQ(28, pictureId);
};
virtual void OnReceivedRPSI(const uint32_t ssrc,
const uint64_t pictureId) {
virtual void OnReceivedRPSI(uint32_t ssrc,
uint64_t pictureId) {
EXPECT_EQ(kTestPictureId, pictureId);
};
private:

10
src/video_engine/vie_encoder.cc
View File

@ -794,19 +794,19 @@ WebRtc_Word32 ViEEncoder::RegisterCodecObserver(ViEEncoderObserver* observer) {
return 0;
}
void ViEEncoder::OnReceivedSLI(const uint32_t /*ssrc*/,
const uint8_t picture_id) {
void ViEEncoder::OnReceivedSLI(uint32_t /*ssrc*/,
uint8_t picture_id) {
picture_id_sli_ = picture_id;
has_received_sli_ = true;
}
void ViEEncoder::OnReceivedRPSI(const uint32_t /*ssrc*/,
const uint64_t picture_id) {
void ViEEncoder::OnReceivedRPSI(uint32_t /*ssrc*/,
uint64_t picture_id) {
picture_id_rpsi_ = picture_id;
has_received_rpsi_ = true;
}
void ViEEncoder::OnReceivedIntraFrameRequest(const uint32_t /*ssrc*/) {
void ViEEncoder::OnReceivedIntraFrameRequest(uint32_t /*ssrc*/) {
// Key frame request from remote side, signal to VCM.
WEBRTC_TRACE(webrtc::kTraceStateInfo, webrtc::kTraceVideo,
ViEId(engine_id_, channel_id_), "%s", __FUNCTION__);

10
src/video_engine/vie_encoder.h
View File

@ -129,13 +129,13 @@ class ViEEncoder
WebRtc_Word32 RegisterCodecObserver(ViEEncoderObserver* observer);
// Implements RtcpIntraFrameObserver.
virtual void OnReceivedIntraFrameRequest(const uint32_t ssrc);
virtual void OnReceivedIntraFrameRequest(uint32_t ssrc);
virtual void OnReceivedSLI(const uint32_t ssrc,
const uint8_t picture_id);
virtual void OnReceivedSLI(uint32_t ssrc,
uint8_t picture_id);
virtual void OnReceivedRPSI(const uint32_t ssrc,
const uint64_t picture_id);
virtual void OnReceivedRPSI(uint32_t ssrc,
uint64_t picture_id);
// Effect filter.
WebRtc_Word32 RegisterEffectFilter(ViEEffectFilter* effect_filter);