Bug 1273965: refactor to remove NS_NOTREACHED draft
authorNils Ohlmeier [:drno] <drno@ohlmeier.org>
Wed, 18 May 2016 10:43:19 -0700
changeset 368389 f50f7e28f8ee4efcb6129c9907cd79eb3aeeed3e
parent 368365 c4449eab07d39e20ea315603f1b1863eeed7dcfe
child 521261 2fcc8c7c3b1e3f09c264ca9c87956907123e378b
push id18523
push userdrno@ohlmeier.org
push dateWed, 18 May 2016 17:43:41 +0000
bugs1273965
milestone49.0a1
Bug 1273965: refactor to remove NS_NOTREACHED MozReview-Commit-ID: 6xmDGv6oZUr
media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
--- a/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaPipelineFactory.cpp
@@ -993,31 +993,29 @@ MediaPipelineFactory::EnsureExternalCode
 #else
       encoder = GmpVideoCodec::CreateEncoder();
 #endif
       if (encoder) {
         return aConduit.SetExternalSendCodec(aConfig, encoder);
       } else {
         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);
-      } else {
-        return kMediaConduitInvalidReceiveCodec;
-      }
+    if (decoder) {
+      return aConduit.SetExternalRecvCodec(aConfig, decoder);
+    } else {
+      return kMediaConduitInvalidReceiveCodec;
     }
-    NS_NOTREACHED("Shouldn't get here!");
   } else {
     MOZ_MTLOG(ML_ERROR,
               "Invalid video codec configured: " << aConfig->mName.c_str());
     return aIsSend ? kMediaConduitInvalidSendCodec
                    : kMediaConduitInvalidReceiveCodec;
   }
 
   NS_NOTREACHED("Shouldn't get here!");