Don't set V bit in flexible mode

webrtc/video/video_send_stream_tests.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.
  */
 #include <algorithm>  // max
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/call.h"
 #include "webrtc/frame_callback.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_header_parser.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_sender.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h"
+#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/interface/event_wrapper.h"
 #include "webrtc/system_wrappers/interface/logging.h"
 #include "webrtc/system_wrappers/interface/ref_count.h"
 #include "webrtc/system_wrappers/interface/sleep.h"
 #include "webrtc/system_wrappers/interface/thread_wrapper.h"
 #include "webrtc/test/call_test.h"
 #include "webrtc/test/configurable_frame_size_encoder.h"
 #include "webrtc/test/fake_texture_frame.h"
 #include "webrtc/test/null_transport.h"
@@ skipping 1756 matching lines @@
     }
 
     VideoSendStream* send_stream_;
   } test;
 
   RunBaseTest(&test);
 }
 
 class VP9HeaderObeserver : public test::SendTest {
  public:
-  VP9HeaderObeserver() : SendTest(VideoSendStreamTest::kDefaultTimeoutMs) {
-    vp9_settings_ = VideoEncoder::GetDefaultVp9Settings();
-  }
+  VP9HeaderObeserver()
+      : SendTest(VideoSendStreamTest::kDefaultTimeoutMs),
+        vp9_encoder_(VP9Encoder::Create()),
+        vp9_settings_(VideoEncoder::GetDefaultVp9Settings()) {}
+
   virtual void ModifyConfigsHook(
       VideoSendStream::Config* send_config,
       std::vector<VideoReceiveStream::Config>* receive_configs,
       VideoEncoderConfig* encoder_config) {}
 
   virtual void InspectHeader(RTPVideoHeaderVP9* vp9videoHeader) = 0;
 
  private:
   const int kVp9PayloadType = 105;
 
   void ModifyConfigs(VideoSendStream::Config* send_config,
                      std::vector<VideoReceiveStream::Config>* receive_configs,
                      VideoEncoderConfig* encoder_config) override {
     encoder_config->encoder_specific_settings = &vp9_settings_;
+    send_config->encoder_settings.encoder = vp9_encoder_.get();
     send_config->encoder_settings.payload_name = "VP9";
     send_config->encoder_settings.payload_type = kVp9PayloadType;
     ModifyConfigsHook(send_config, receive_configs, encoder_config);
   }
 
   void PerformTest() override {
     EXPECT_EQ(kEventSignaled, Wait())
         << "Test timed out waiting for VP9 packet";
   }
 
@@ skipping 20 matching lines @@
       if (parse_vp9header_successful && is_vp9_codec_type) {
         InspectHeader(vp9videoHeader);
       } else {
         observation_complete_->Set();
       }
     }
 
     return SEND_PACKET;
   }
 
-protected:
+ protected:
+  rtc::scoped_ptr<VP9Encoder> vp9_encoder_;
   VideoCodecVP9 vp9_settings_;
 };
 
 TEST_F(VideoSendStreamTest, VP9NoFlexMode) {
   class NoFlexibleMode : public VP9HeaderObeserver {
     void InspectHeader(RTPVideoHeaderVP9* vp9videoHeader) override {
       EXPECT_FALSE(vp9videoHeader->flexible_mode);
       observation_complete_->Set();
     }
   } test;
 
   RunBaseTest(&test);
 }
 
-// TODO(philipel): Enable once flexible mode is implemeted.
-TEST_F(VideoSendStreamTest, DISABLED_VP9FlexMode) {
+TEST_F(VideoSendStreamTest, VP9FlexMode) {
   class FlexibleMode : public VP9HeaderObeserver {
     void ModifyConfigsHook(
         VideoSendStream::Config* send_config,
         std::vector<VideoReceiveStream::Config>* receive_configs,
         VideoEncoderConfig* encoder_config) override {
       vp9_settings_.flexibleMode = true;
-      encoder_config->encoder_specific_settings = &vp9_settings_;
     }
 
     void InspectHeader(RTPVideoHeaderVP9* vp9videoHeader) override {
       EXPECT_TRUE(vp9videoHeader->flexible_mode);
       observation_complete_->Set();
     }
 
   } test;
 
   RunBaseTest(&test);
 }
 
 }  // namespace webrtc