Bug 1273965 part 2: Collapse & de-indent one else-after-return in MediaPipelineFactory.cpp, and drop a now-clearly-unnecessary NS_NOTREACHED. r?bwc
MozReview-Commit-ID: EJhWQf9DzyT
--- a/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
@@ -992,30 +992,28 @@ MediaPipelineFactory::EnsureExternalCode
OMXVideoCodec::CreateEncoder(OMXVideoCodec::CodecType::CODEC_H264);
#else
encoder = GmpVideoCodec::CreateEncoder();
#endif
if (encoder) {
return aConduit.SetExternalSendCodec(aConfig, encoder);
}
return kMediaConduitInvalidSendCodec;
- } else {
- VideoDecoder* decoder = nullptr;
+ }
+ VideoDecoder* decoder = nullptr;
#ifdef MOZ_WEBRTC_OMX
- decoder =
- OMXVideoCodec::CreateDecoder(OMXVideoCodec::CodecType::CODEC_H264);
+ decoder =
+ OMXVideoCodec::CreateDecoder(OMXVideoCodec::CodecType::CODEC_H264);
#else
- decoder = GmpVideoCodec::CreateDecoder();
+ decoder = GmpVideoCodec::CreateDecoder();
#endif
- if (decoder) {
- return aConduit.SetExternalRecvCodec(aConfig, decoder);
- }
- return kMediaConduitInvalidReceiveCodec;
+ if (decoder) {
+ return aConduit.SetExternalRecvCodec(aConfig, decoder);
}
- NS_NOTREACHED("Shouldn't get here!");
+ return kMediaConduitInvalidReceiveCodec;
} else {
MOZ_MTLOG(ML_ERROR,
"Invalid video codec configured: " << aConfig->mName.c_str());
return aIsSend ? kMediaConduitInvalidSendCodec
: kMediaConduitInvalidReceiveCodec;
}
NS_NOTREACHED("Shouldn't get here!");