Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1023075 - Fix more clang warnings in webrtc/signaling. r=jesup

Browse Source
This commit is contained in:
Chris Peterson 2014-06-09 22:42:11 -07:00
parent c04dc8b035
commit 9349d93d76
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
media/webrtc/signaling/src/common/browser_logging/WebRtcLog.cpp
View File

@ -33,9 +33,10 @@ class WebRtcTraceCallback: public webrtc::TraceCallback
public:
void Print(webrtc::TraceLevel level, const char* message, int length)
{
#ifdef PR_LOGGING
PRLogModuleInfo *log = GetWebRtcTraceLog();
PR_LOG(log, PR_LOG_DEBUG, ("%s", message));
return;
#endif
}
};

10
media/webrtc/signaling/src/media-conduit/CodecStatistics.cpp
View File

@ -22,9 +22,11 @@ VideoCodecStatistics::VideoCodecStatistics(int channel,
mEncoderDroppedFrames(0),
mDecoderDiscardedPackets(0),
mEncoderMode(encoder),
mReceiveState(kReceiveStateInitial),
mRecoveredBeforeLoss(0),
mRecoveredLosses(0)
mReceiveState(kReceiveStateInitial)
#ifdef MOZILLA_INTERNAL_API
, mRecoveredBeforeLoss(0)
, mRecoveredLosses(0)
#endif
{
MOZ_ASSERT(mPtrViECodec);
if (mEncoderMode) {
@ -137,7 +139,7 @@ void VideoCodecStatistics::EndOfCallStats()
TimeDuration callDelta = TimeStamp::Now() - mFirstDecodeTime;
if (callDelta.ToSeconds() != 0) {
uint32_t recovered_per_min = mRecoveredBeforeLoss/(callDelta.ToSeconds()/60);
CSFLogError(logTag, "Video recovery before error per min %f", recovered_per_min);
CSFLogError(logTag, "Video recovery before error per min %u", recovered_per_min);
Telemetry::Accumulate(Telemetry::WEBRTC_VIDEO_RECOVERY_BEFORE_ERROR_PER_MIN,
recovered_per_min);
uint32_t err_per_min = mRecoveredLosses/(callDelta.ToSeconds()/60);

3
media/webrtc/signaling/src/media-conduit/CodecStatistics.h
View File

@ -99,10 +99,11 @@ private:
TimeStamp mFirstDecodeTime;
TimeStamp mReceiveFailureTime;
TimeDuration mTotalLossTime;
#endif
uint32_t mRecoveredBeforeLoss;
uint32_t mRecoveredLosses;
#endif
};
}
#endif //CODEC_STATISTICS_H_

4
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
View File

@ -2007,6 +2007,8 @@ PeerConnectionImpl::IceConnectionStateChange_m(PCImplIceConnectionState aState)
case PCImplIceConnectionState::Closed:
STAMP_TIMECARD(mTimeCard, "Ice state: closed");
break;
default:
MOZ_ASSERT_UNREACHABLE("Unexpected mIceConnectionState!");
}
nsRefPtr<PeerConnectionObserver> pco = do_QueryObjectReferent(mPCObserver);
@ -2044,6 +2046,8 @@ PeerConnectionImpl::IceGatheringStateChange_m(PCImplIceGatheringState aState)
case PCImplIceGatheringState::Complete:
STAMP_TIMECARD(mTimeCard, "Ice gathering state: complete");
break;
default:
MOZ_ASSERT_UNREACHABLE("Unexpected mIceGatheringState!");
}
nsRefPtr<PeerConnectionObserver> pco = do_QueryObjectReferent(mPCObserver);