Bug 1273965 part 2: Collapse & de-indent one else-after-return in MediaPipelineFactory.cpp, and drop a now-clearly-unnecessary NS_NOTREACHED. r?bwc draft
authorDaniel Holbert <dholbert@cs.stanford.edu>
Wed, 18 May 2016 10:55:58 -0700
changeset 368403 dea51712449bcba3d18412ef4f416a78f2a14659
parent 368402 72e598a373e0e9dadd9354fcc8d7c571472b45a6
child 368404 d0b8c25b03e851d66a006f85c66952d4bf5ab694
push id18525
push userdholbert@mozilla.com
push dateWed, 18 May 2016 17:56:35 +0000
reviewersbwc
bugs1273965
milestone49.0a1
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
media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
--- 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!");