Add QP stats for sent video streams to StatsReport.

webrtc/video/send_statistics_proxy_unittest.cc

 /*
  *  Copyright (c) 2013 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 // This file includes unit tests for SendStatisticsProxy.
 #include "webrtc/video/send_statistics_proxy.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/histogram.h"
 
 namespace webrtc {
 
 class SendStatisticsProxyTest : public ::testing::Test {
  public:
   SendStatisticsProxyTest()
       : fake_clock_(1234), config_(GetTestConfig()), avg_delay_ms_(0),
         max_delay_ms_(0) {}
   virtual ~SendStatisticsProxyTest() {}
 
@@ skipping 348 matching lines @@
   statistics_proxy_->OnSendEncodedImage(encoded_image, &rtp_video_header);
 
   statistics_proxy_->OnInactiveSsrc(config_.rtp.ssrcs[1]);
   VideoSendStream::Stats stats = statistics_proxy_->GetStats();
   EXPECT_EQ(kEncodedWidth, stats.substreams[config_.rtp.ssrcs[0]].width);
   EXPECT_EQ(kEncodedHeight, stats.substreams[config_.rtp.ssrcs[0]].height);
   EXPECT_EQ(0, stats.substreams[config_.rtp.ssrcs[1]].width);
   EXPECT_EQ(0, stats.substreams[config_.rtp.ssrcs[1]].height);
 }
 
+TEST_F(SendStatisticsProxyTest, Qp) {
+  const int kQpIdx0 = 21;
+  const int kQpIdx1 = 39;
+  EncodedImage encoded_image;
+
+  RTPVideoHeader rtp_video_header;
+  rtp_video_header.codec = kRtpVideoVp8;
+
+  rtp_video_header.simulcastIdx = 0;
+  encoded_image.qp_ = kQpIdx0;
+  statistics_proxy_->OnSendEncodedImage(encoded_image, &rtp_video_header);
+
+  rtp_video_header.simulcastIdx = 1;
+  encoded_image.qp_ = kQpIdx1;
+  statistics_proxy_->OnSendEncodedImage(encoded_image, &rtp_video_header);
+
+  VideoSendStream::Stats stats = statistics_proxy_->GetStats();
+  EXPECT_EQ(kQpIdx0, stats.substreams[config_.rtp.ssrcs[0]].qp);
+  EXPECT_EQ(kQpIdx1, stats.substreams[config_.rtp.ssrcs[1]].qp);
+}
+
+TEST_F(SendStatisticsProxyTest, VerifyQpHistogramStats_Vp8) {
+  test::ClearHistograms();
+  const int kMinRequiredSamples = 200;
+  const int kQpIdx0 = 21;
+  const int kQpIdx1 = 39;
+  EncodedImage encoded_image;
+
+  RTPVideoHeader rtp_video_header;
+  rtp_video_header.codec = kRtpVideoVp8;
+
+  for (int i = 0; i < kMinRequiredSamples; ++i) {
+    rtp_video_header.simulcastIdx = 0;
+    encoded_image.qp_ = kQpIdx0;
+    statistics_proxy_->OnSendEncodedImage(encoded_image, &rtp_video_header);
+    rtp_video_header.simulcastIdx = 1;
+    encoded_image.qp_ = kQpIdx1;
+    statistics_proxy_->OnSendEncodedImage(encoded_image, &rtp_video_header);
+  }
+  statistics_proxy_.reset();
+  EXPECT_EQ(2, test::NumHistogramSamples("WebRTC.Video.Encoded.Vp8.Qp"));
+  EXPECT_EQ(kQpIdx1, test::LastHistogramSample("WebRTC.Video.Encoded.Vp8.Qp"));
+}
+
 TEST_F(SendStatisticsProxyTest, ClearsBitratesFromInactiveSsrcs) {
   BitrateStatistics bitrate;
   bitrate.bitrate_bps = 42;
   BitrateStatisticsObserver* observer = statistics_proxy_.get();
   observer->Notify(bitrate, bitrate, config_.rtp.ssrcs[0]);
   observer->Notify(bitrate, bitrate, config_.rtp.ssrcs[1]);
 
   statistics_proxy_->OnInactiveSsrc(config_.rtp.ssrcs[1]);
 
   VideoSendStream::Stats stats = statistics_proxy_->GetStats();
   EXPECT_EQ(static_cast<int>(bitrate.bitrate_bps),
             stats.substreams[config_.rtp.ssrcs[0]].total_bitrate_bps);
   EXPECT_EQ(static_cast<int>(bitrate.bitrate_bps),
             stats.substreams[config_.rtp.ssrcs[0]].retransmit_bitrate_bps);
   EXPECT_EQ(0, stats.substreams[config_.rtp.ssrcs[1]].total_bitrate_bps);
   EXPECT_EQ(0, stats.substreams[config_.rtp.ssrcs[1]].retransmit_bitrate_bps);
 }
 
 }  // namespace webrtc