Bug 1620660 - Use streamCount consistently in CreateEncoderStreams; r=ng
authorDan Minor <dminor@mozilla.com>
Tue, 10 Mar 2020 19:45:13 +0000
changeset 518203 cf995779fc05c87b8d941a9698528fd8e6276a56
parent 518202 3083337429be51cfd990ec1fb41fee20e8207789
child 518204 649a2a4d16d088b116976231b73b3defdf6e5e5f
push id109816
push userdminor@mozilla.com
push dateWed, 11 Mar 2020 15:02:42 +0000
treeherderautoland@649a2a4d16d0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersng
bugs1620660
milestone76.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1620660 - Use streamCount consistently in CreateEncoderStreams; r=ng Differential Revision: https://phabricator.services.mozilla.com/D65799
media/webrtc/signaling/src/media-conduit/VideoStreamFactory.cpp
--- a/media/webrtc/signaling/src/media-conduit/VideoStreamFactory.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoStreamFactory.cpp
@@ -210,17 +210,17 @@ std::vector<webrtc::VideoStream> VideoSt
                    mStartBitrate, encoding.constraints.maxBr, mPrefMaxBitrate,
                    mNegotiatedMaxBitrate, video_stream);
 
     video_stream.max_qp = kQpMax;
     video_stream.SetRid(encoding.rid);
 
     // leave vector temporal_layer_thresholds_bps empty for non-simulcast
     video_stream.temporal_layer_thresholds_bps.clear();
-    if (config.number_of_streams > 1) {
+    if (streamCount > 1) {
       // XXX Note: in simulcast.cc in upstream code, the array value is
       // 3(-1) for all streams, though it's in an array, except for screencasts,
       // which use 1 (i.e 2 layers).
 
       // Oddly, though this is a 'bps' array, nothing really looks at the
       // values for normal video, just the size of the array to know the
       // number of temporal layers.
       // For VideoEncoderConfig::ContentType::kScreen, though, in