Signal target bitrate only for screenshare streams

webrtc/video/end_to_end_tests.cc

Index: webrtc/video/end_to_end_tests.cc
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index 61b75af315405e4f8ad74dcfd1f720a9242f6b1d..28a00764671a2b3ab43be832b8a3d6383a9ff7d6 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -2996,9 +2996,10 @@ TEST_P(EndToEndTest, GetStats) {
 
 class RtcpXrObserver : public test::EndToEndTest {
  public:
-  explicit RtcpXrObserver(bool enable_rrtr)
+  RtcpXrObserver(bool enable_rrtr, bool is_screenshare)
       : EndToEndTest(test::CallTest::kDefaultTimeoutMs),
         enable_rrtr_(enable_rrtr),
+        is_screenshare_(is_screenshare),
         sent_rtcp_sr_(0),
         sent_rtcp_rr_(0),
         sent_rtcp_rrtr_(0),
@@ -3041,7 +3042,7 @@ class RtcpXrObserver : public test::EndToEndTest {
 
     if (sent_rtcp_sr_ > kNumRtcpReportPacketsToObserve &&
         sent_rtcp_rr_ > kNumRtcpReportPacketsToObserve &&
-        sent_rtcp_target_bitrate_) {
+        (sent_rtcp_target_bitrate_ || !is_screenshare_)) {
       if (enable_rrtr_) {
         EXPECT_GT(sent_rtcp_rrtr_, 0);
         EXPECT_GT(sent_rtcp_dlrr_, 0);
@@ -3049,6 +3050,7 @@ class RtcpXrObserver : public test::EndToEndTest {
         EXPECT_EQ(sent_rtcp_rrtr_, 0);
         EXPECT_EQ(sent_rtcp_dlrr_, 0);
       }
+      EXPECT_EQ(is_screenshare_, sent_rtcp_target_bitrate_);
       observation_complete_.Set();
     }
     return SEND_PACKET;
@@ -3058,6 +3060,10 @@ class RtcpXrObserver : public test::EndToEndTest {
       VideoSendStream::Config* send_config,
       std::vector<VideoReceiveStream::Config>* receive_configs,
       VideoEncoderConfig* encoder_config) override {
+    if (is_screenshare_) {
+      // TargetBitrate only signaled for screensharing.
+      encoder_config->content_type = VideoEncoderConfig::ContentType::kScreen;
+    }
     (*receive_configs)[0].rtp.rtcp_mode = RtcpMode::kReducedSize;
     (*receive_configs)[0].rtp.rtcp_xr.receiver_reference_time_report =
         enable_rrtr_;
@@ -3071,7 +3077,8 @@ class RtcpXrObserver : public test::EndToEndTest {
   static const int kNumRtcpReportPacketsToObserve = 5;
 
   rtc::CriticalSection crit_;
-  bool enable_rrtr_;
+  const bool enable_rrtr_;
+  const bool is_screenshare_;

[danilchap, 2017/01/12 12:27:51]

may be rename to enable_target_bitrate_
to match variable above and be more explicit what scenario this variable tests.

[sprang_webrtc, 2017/01/12 12:43:08]

Done.

   int sent_rtcp_sr_;
   int sent_rtcp_rr_ GUARDED_BY(&crit_);
   int sent_rtcp_rrtr_ GUARDED_BY(&crit_);
@@ -3080,12 +3087,22 @@ class RtcpXrObserver : public test::EndToEndTest {
 };
 
 TEST_P(EndToEndTest, TestExtendedReportsWithRrtr) {
-  RtcpXrObserver test(true);
+  RtcpXrObserver test(true, false);
   RunBaseTest(&test);
 }
 
 TEST_P(EndToEndTest, TestExtendedReportsWithoutRrtr) {
-  RtcpXrObserver test(false);
+  RtcpXrObserver test(false, false);
+  RunBaseTest(&test);
+}
+
+TEST_P(EndToEndTest, TestExtendedReportsWithRrtrScreenshare) {
+  RtcpXrObserver test(true, true);
+  RunBaseTest(&test);
+}
+
+TEST_P(EndToEndTest, TestExtendedReportsWithoutRrtrScreenshare) {
+  RtcpXrObserver test(false, true);
   RunBaseTest(&test);
 }