Added return due to gcc complaints in r1604.
TBR=andrew TEST=Bulid with clang version 3.1 (trunk 148911) and gcc. Review URL: https://webrtc-codereview.appspot.com/384004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1606 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
86ce46d4ff
commit
657b2a4965
@ -230,6 +230,8 @@ libyuv::RotationMode ConvertRotationMode(VideoRotationMode rotation) {
|
||||
case kRotate270:
|
||||
return libyuv::kRotate270;
|
||||
}
|
||||
assert(false);
|
||||
return libyuv::kRotate0;
|
||||
}
|
||||
|
||||
int ConvertVideoType(VideoType video_type) {
|
||||
@ -266,6 +268,8 @@ int ConvertVideoType(VideoType video_type) {
|
||||
case kBGRA:
|
||||
return libyuv::FOURCC_BGRA;
|
||||
}
|
||||
assert(false);
|
||||
return libyuv::FOURCC_ANY;
|
||||
}
|
||||
|
||||
int ConvertToI420(VideoType src_video_type,
|
||||
|
@ -33,6 +33,8 @@ WebRtc_Word16 MapSetting(EchoCancellation::SuppressionLevel level) {
|
||||
case EchoCancellation::kHighSuppression:
|
||||
return kAecNlpAggressive;
|
||||
}
|
||||
assert(false);
|
||||
return -1;
|
||||
}
|
||||
|
||||
int MapError(int err) {
|
||||
|
@ -37,6 +37,8 @@ WebRtc_Word16 MapSetting(EchoControlMobile::RoutingMode mode) {
|
||||
case EchoControlMobile::kLoudSpeakerphone:
|
||||
return 4;
|
||||
}
|
||||
assert(false);
|
||||
return -1;
|
||||
}
|
||||
|
||||
int MapError(int err) {
|
||||
|
@ -48,6 +48,8 @@ WebRtc_Word16 MapSetting(GainControl::Mode mode) {
|
||||
return kAgcModeFixedDigital;
|
||||
break;
|
||||
}
|
||||
assert(false);
|
||||
return -1;
|
||||
}
|
||||
} // namespace
|
||||
|
||||
|
@ -2258,6 +2258,8 @@ WebRtc_Word32 ModuleRtpRtcpImpl::RequestKeyFrame(const FrameType frameType) {
|
||||
return _rtcpSender.SendRTCP(kRtcpFir, 0, NULL, RTT);
|
||||
}
|
||||
}
|
||||
assert(false);
|
||||
return -1;
|
||||
}
|
||||
|
||||
WebRtc_Word32 ModuleRtpRtcpImpl::SendRTCPSliceLossIndication(
|
||||
|
@ -49,6 +49,8 @@ FilePlayer* FilePlayer::CreateFilePlayer(WebRtc_UWord32 instanceID,
|
||||
return NULL;
|
||||
#endif
|
||||
}
|
||||
assert(false);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void FilePlayer::DestroyFilePlayer(FilePlayer* player)
|
||||
|
@ -51,6 +51,8 @@ FileRecorder* FileRecorder::CreateFileRecorder(WebRtc_UWord32 instanceID,
|
||||
return NULL;
|
||||
#endif
|
||||
}
|
||||
assert(false);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void FileRecorder::DestroyFileRecorder(FileRecorder* recorder)
|
||||
|
@ -542,6 +542,8 @@ namespace webrtc
|
||||
case TYPE_Float64:
|
||||
return StdKeySort<double>(data, key, numOfElements, sizeOfElement);
|
||||
}
|
||||
assert(false);
|
||||
return -1;
|
||||
#endif
|
||||
}
|
||||
} // namespace webrtc
|
||||
|
@ -264,8 +264,6 @@ void FrameDropDetector::ReportFrameState(State state, unsigned int timestamp) {
|
||||
rendered_frames_[timestamp] = webrtc::TickTime::MicrosecondTimestamp();
|
||||
num_rendered_frames_++;
|
||||
break;
|
||||
default:
|
||||
assert(false);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -36,6 +36,8 @@ static RTCPMethod ViERTCPModeToRTCPMethod(ViERTCPMode api_mode) {
|
||||
case kRtcpNonCompound_RFC5506:
|
||||
return kRtcpNonCompound;
|
||||
}
|
||||
assert(false);
|
||||
return kRtcpOff;
|
||||
}
|
||||
|
||||
static ViERTCPMode RTCPMethodToViERTCPMode(RTCPMethod module_method) {
|
||||
@ -49,6 +51,8 @@ static ViERTCPMode RTCPMethodToViERTCPMode(RTCPMethod module_method) {
|
||||
case kRtcpNonCompound:
|
||||
return kRtcpNonCompound_RFC5506;
|
||||
}
|
||||
assert(false);
|
||||
return kRtcpNone;
|
||||
}
|
||||
|
||||
static KeyFrameRequestMethod APIRequestToModuleRequest(
|
||||
@ -66,6 +70,8 @@ static KeyFrameRequestMethod APIRequestToModuleRequest(
|
||||
case kViEKeyFrameRequestFirRtcp:
|
||||
return kKeyFrameReqFirRtcp;
|
||||
}
|
||||
assert(false);
|
||||
return kKeyFrameReqFirRtp;
|
||||
}
|
||||
|
||||
ViERTP_RTCP* ViERTP_RTCP::GetInterface(VideoEngine* video_engine) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user