Backed out changeset 847e9f622eb7 (bug 1432793) for build bustages on VideoConduit.cpp. CLOSED TREE

media/webrtc/signaling/src/media-conduit/VideoConduit.cpp

@@ -581,20 +581,7 @@ std::vector<webrtc::VideoStream>
 WebrtcVideoConduit::VideoStreamFactory::CreateEncoderStreams(int width, int height,
                                                              const webrtc::VideoEncoderConfig& config)
 {
-  size_t streamCount = config.number_of_streams;
-
-  // Disallow odd width and height, they will cause aspect ratio checks to
-  // fail in the webrtc.org code. We can hit transient states after window
-  // sharing ends where odd resolutions are requested for the camera.
-  streamCount = std::min(streamCount,
-                         1UL + std::min(CountTrailingZeroes32(width),
-                                        CountTrailingZeroes32(height)));
-
-  // We only allow one layer when screensharing
-  if (mConduit->mCodecMode == webrtc::VideoCodecMode::kScreensharing) {
-    streamCount = 1;
-  }
-
+  auto streamCount = config.number_of_streams;
   std::vector<webrtc::VideoStream> streams;
   streams.reserve(streamCount);
   MOZ_ASSERT(mConduit);