Wire up BitrateAllocation to be sent as RTCP TargetBitrate

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 cf8d5d099f32058e26551bfab0614b9a3a6617a1..7c0c74187d0eb8dd603657bb8e500ab455423975 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -2436,7 +2436,7 @@ TEST_P(EndToEndTest, VerifyHistogramStatsWithScreenshare) {
 }
 
 void EndToEndTest::TestXrReceiverReferenceTimeReport(bool enable_rrtr) {

[danilchap, 2016/11/29 10:39:32]

rename or better fork test since now it is used to track target_bitrate too

[sprang_webrtc, 2016/11/29 12:24:01]

I briefly explored that but it turned out messier than I would like. Prefer not
to spent too much time on this. Renamed the test though and moved out
RtcpXrObserver way down to where it is actually used.

[danilchap, 2016/11/29 13:13:14]

ok

-  static const int kNumRtcpReportPacketsToObserve = 5;
+  static const int kNumRtcpReportPacketsToObserve = 10;
   class RtcpXrObserver : public test::EndToEndTest {
    public:
     explicit RtcpXrObserver(bool enable_rrtr)
@@ -2445,6 +2445,7 @@ void EndToEndTest::TestXrReceiverReferenceTimeReport(bool enable_rrtr) {
           sent_rtcp_sr_(0),
           sent_rtcp_rr_(0),
           sent_rtcp_rrtr_(0),
+          sent_rtcp_target_bitrate_(false),
           sent_rtcp_dlrr_(0) {}
 
    private:
@@ -2472,21 +2473,24 @@ void EndToEndTest::TestXrReceiverReferenceTimeReport(bool enable_rrtr) {
       EXPECT_TRUE(parser.Parse(packet, length));
 
       sent_rtcp_sr_ += parser.sender_report()->num_packets();
-      EXPECT_GE(1, parser.xr()->num_packets());
+      EXPECT_LE(parser.xr()->num_packets(), 2);  // dlrr and/or target bitrate.
       if (parser.xr()->num_packets() > 0) {
         EXPECT_FALSE(parser.xr()->rrtr());
         if (parser.xr()->dlrr())
           ++sent_rtcp_dlrr_;
+        if (parser.xr()->target_bitrate())
+          sent_rtcp_target_bitrate_ = true;
       }
 
       if (sent_rtcp_sr_ > kNumRtcpReportPacketsToObserve &&
-          sent_rtcp_rr_ > kNumRtcpReportPacketsToObserve) {
+          sent_rtcp_rr_ > kNumRtcpReportPacketsToObserve &&
+          sent_rtcp_target_bitrate_) {
         if (enable_rrtr_) {
-          EXPECT_LT(0, sent_rtcp_rrtr_);
-          EXPECT_LT(0, sent_rtcp_dlrr_);
+          EXPECT_GT(sent_rtcp_rrtr_, 0);

[danilchap, 2016/11/29 10:39:32]

Yep, no need to write expected value first this days. Can now order parameters
of EXPECT_* macros in a nicer way :)

+          EXPECT_GT(sent_rtcp_dlrr_, 0);
         } else {
-          EXPECT_EQ(0, sent_rtcp_rrtr_);
-          EXPECT_EQ(0, sent_rtcp_dlrr_);
+          EXPECT_EQ(sent_rtcp_rrtr_, 0);
+          EXPECT_EQ(sent_rtcp_dlrr_, 0);
         }
         observation_complete_.Set();
       }
@@ -2512,6 +2516,7 @@ void EndToEndTest::TestXrReceiverReferenceTimeReport(bool enable_rrtr) {
     int sent_rtcp_sr_;
     int sent_rtcp_rr_ GUARDED_BY(&crit_);
     int sent_rtcp_rrtr_ GUARDED_BY(&crit_);
+    bool sent_rtcp_target_bitrate_ GUARDED_BY(&crit_);
     int sent_rtcp_dlrr_;
   } test(enable_rrtr);