From 9d453931c51d43b768c63bc8f4b0eef241b8aa35 Mon Sep 17 00:00:00 2001 From: "asapersson@webrtc.org" Date: Thu, 4 Sep 2014 07:07:44 +0000 Subject: [PATCH] Change return value for number of discarded packets to be int. R=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/14209004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7054 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/video/receive_statistics_proxy.cc | 2 +- webrtc/video_engine/include/vie_codec.h | 8 +++++++- .../test/auto_test/source/vie_autotest_custom_call.cc | 2 +- webrtc/video_engine/vie_codec_impl.cc | 8 ++++---- webrtc/video_engine/vie_codec_impl.h | 2 +- webrtc/video_receive_stream.h | 2 +- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/webrtc/video/receive_statistics_proxy.cc b/webrtc/video/receive_statistics_proxy.cc index 60042818e8..3826283447 100644 --- a/webrtc/video/receive_statistics_proxy.cc +++ b/webrtc/video/receive_statistics_proxy.cc @@ -42,7 +42,7 @@ VideoReceiveStream::Stats ReceiveStatisticsProxy::GetStats() const { } stats.c_name = GetCName(); codec_->GetReceiveSideDelay(channel_, &stats.avg_delay_ms); - stats.discarded_packets = codec_->GetDiscardedPackets(channel_); + stats.discarded_packets = codec_->GetNumDiscardedPackets(channel_); codec_->GetReceiveCodecStastistics( channel_, stats.key_frames, stats.delta_frames); diff --git a/webrtc/video_engine/include/vie_codec.h b/webrtc/video_engine/include/vie_codec.h index f658aaa245..c6354d3309 100644 --- a/webrtc/video_engine/include/vie_codec.h +++ b/webrtc/video_engine/include/vie_codec.h @@ -150,7 +150,13 @@ class WEBRTC_DLLEXPORT ViECodec { // Gets the number of packets discarded by the jitter buffer because they // arrived too late. - virtual unsigned int GetDiscardedPackets(const int video_channel) const = 0; + // TODO(asapersson): Remove default implementation. + virtual int GetNumDiscardedPackets(int video_channel) const { return -1; } + + // TODO(asapersson): Remove once the api has been removed from + // fakewebrtcvideoengine.h. + virtual unsigned int GetDiscardedPackets( + const int video_channel) const { return 0; } // Enables key frame request callback in ViEDecoderObserver. virtual int SetKeyFrameRequestCallbackStatus(const int video_channel, diff --git a/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc b/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc index f9a5c220c3..b22e3673b7 100644 --- a/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc +++ b/webrtc/video_engine/test/auto_test/source/vie_autotest_custom_call.cc @@ -1651,7 +1651,7 @@ void PrintCodecStatistics(webrtc::ViECodec* vie_codec, void PrintGetDiscardedPackets(webrtc::ViECodec* vie_codec, int video_channel) { std::cout << "Discarded Packets" << std::endl; int discarded_packets = 0; - discarded_packets = vie_codec->GetDiscardedPackets(video_channel); + discarded_packets = vie_codec->GetNumDiscardedPackets(video_channel); std::cout << "\tNumber of discarded packets: " << discarded_packets << std::endl; } diff --git a/webrtc/video_engine/vie_codec_impl.cc b/webrtc/video_engine/vie_codec_impl.cc index 81736d64e9..f939a667cf 100644 --- a/webrtc/video_engine/vie_codec_impl.cc +++ b/webrtc/video_engine/vie_codec_impl.cc @@ -416,20 +416,20 @@ int ViECodecImpl::GetCodecTargetBitrate(const int video_channel, return vie_encoder->CodecTargetBitrate(static_cast(bitrate)); } -unsigned int ViECodecImpl::GetDiscardedPackets(const int video_channel) const { +int ViECodecImpl::GetNumDiscardedPackets(int video_channel) const { ViEChannelManagerScoped cs(*(shared_data_->channel_manager())); ViEChannel* vie_channel = cs.Channel(video_channel); if (!vie_channel) { shared_data_->SetLastError(kViECodecInvalidChannelId); - return static_cast(-1); + return -1; } - return vie_channel->DiscardedPackets(); + return static_cast(vie_channel->DiscardedPackets()); } int ViECodecImpl::SetKeyFrameRequestCallbackStatus(const int video_channel, const bool enable) { LOG(LS_INFO) << "SetKeyFrameRequestCallbackStatus for " << video_channel - << ", enacle " << enable; + << ", enable " << enable; ViEChannelManagerScoped cs(*(shared_data_->channel_manager())); ViEChannel* vie_channel = cs.Channel(video_channel); diff --git a/webrtc/video_engine/vie_codec_impl.h b/webrtc/video_engine/vie_codec_impl.h index cee3ed2b2d..ed8bf8a7b4 100644 --- a/webrtc/video_engine/vie_codec_impl.h +++ b/webrtc/video_engine/vie_codec_impl.h @@ -53,7 +53,7 @@ class ViECodecImpl int* delay_ms) const; virtual int GetCodecTargetBitrate(const int video_channel, unsigned int* bitrate) const; - virtual unsigned int GetDiscardedPackets(const int video_channel) const; + virtual int GetNumDiscardedPackets(int video_channel) const; virtual int SetKeyFrameRequestCallbackStatus(const int video_channel, const bool enable); virtual int SetSignalKeyPacketLossStatus(const int video_channel, diff --git a/webrtc/video_receive_stream.h b/webrtc/video_receive_stream.h index b1633f938d..4eb5532b7b 100644 --- a/webrtc/video_receive_stream.h +++ b/webrtc/video_receive_stream.h @@ -68,7 +68,7 @@ class VideoReceiveStream { int decode_frame_rate; int render_frame_rate; int avg_delay_ms; - uint32_t discarded_packets; + int discarded_packets; uint32_t ssrc; std::string c_name; };