Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / webrtc / video / full_stack.cc

diff --git a/src/third_party/webrtc/video/full_stack.cc b/src/third_party/webrtc/video/full_stack.cc
index f2d71a9..25e60eb 100644 (file)
--- a/src/third_party/webrtc/video/full_stack.cc
+++ b/src/third_party/webrtc/video/full_stack.cc
@@ -360,8 +360,8 @@ class VideoAnalyzer : public PacketReceiver,
   std::map<uint32_t, int64_t> send_times_ GUARDED_BY(crit_);
   std::map<uint32_t, int64_t> recv_times_ GUARDED_BY(crit_);
   I420VideoFrame* first_send_frame_ GUARDED_BY(crit_);
-  double avg_psnr_threshold_ GUARDED_BY(crit_);
-  double avg_ssim_threshold_ GUARDED_BY(crit_);
+  const double avg_psnr_threshold_;
+  const double avg_ssim_threshold_;
 
   const scoped_ptr<CriticalSectionWrapper> comparison_lock_;
   const scoped_ptr<ThreadWrapper> comparison_thread_;
@@ -392,6 +392,7 @@ void FullStackTest::RunTest(const FullStackTestParams& params) {
   send_config_.encoder_settings.encoder = encoder.get();
   send_config_.encoder_settings.payload_name = "VP8";
   send_config_.encoder_settings.payload_type = 124;
+  send_config_.rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
 
   VideoStream* stream = &encoder_config_.streams[0];
   stream->width = params.clip.width;
@@ -403,6 +404,7 @@ void FullStackTest::RunTest(const FullStackTestParams& params) {
 
   CreateMatchingReceiveConfigs();
   receive_configs_[0].renderer = &analyzer;
+  receive_configs_[0].rtp.nack.rtp_history_ms = kNackRtpHistoryMs;
 
   CreateStreams();
   analyzer.input_ = send_stream_->Input();
@@ -457,6 +459,20 @@ TEST_F(FullStackTest, ForemanCifWithoutPacketLoss) {
   RunTest(foreman_cif);
 }
 
+TEST_F(FullStackTest, ForemanCifPlr5) {
+  FullStackTestParams foreman_cif = {"foreman_cif_delay_50_0_plr_5",
+                                     {"foreman_cif", 352, 288, 30},
+                                     30000,
+                                     500000,
+                                     2000000,
+                                     0.0,
+                                     0.0
+                                    };
+  foreman_cif.link.loss_percent = 5;
+  foreman_cif.link.queue_delay_ms = 50;
+  RunTest(foreman_cif);
+}
+
 TEST_F(FullStackTest, ForemanCif500kbps) {
   FullStackTestParams foreman_cif = {"foreman_cif_500kbps",
                                      {"foreman_cif", 352, 288, 30},