commit 2127aaa64e99fa85ea8e3a3a733c50c952191a5c
author Eldar Rello <elrello@microsoft.com> Fri Aug 07 12:08:14 2020 +0300
committer Commit Bot <commit-bot@chromium.org> Fri Aug 07 10:32:41 2020 +0000
tree 182eff34e9e90472bef3c12c4d1c744b024abb39
parent f7721fb24619d2cae980f6e2183c0f77f0a2c432

Add new fmtp parameter for H.264

Bug: webrtc:11769, webrtc:8423, webrtc:11376
Change-Id: Ia8f22ff90f817ba46ca03de1e43d3088c05023cd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178904
Commit-Queue: Eldar Rello <elrello@microsoft.com>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31878}

modules/video_coding/packet_buffer.cc

diff --git a/modules/video_coding/packet_buffer.cc b/modules/video_coding/packet_buffer.cc
index 7da8a1c..d2a2bcf 100644
--- a/modules/video_coding/packet_buffer.cc
+++ b/modules/video_coding/packet_buffer.cc
@@ -31,7 +31,6 @@
 #include "rtc_base/logging.h"
 #include "rtc_base/numerics/mod_ops.h"
 #include "system_wrappers/include/clock.h"
-#include "system_wrappers/include/field_trial.h"
 
 namespace webrtc {
 namespace video_coding {
@@ -63,8 +62,7 @@
       first_packet_received_(false),
       is_cleared_to_first_seq_num_(false),
       buffer_(start_buffer_size),
-      sps_pps_idr_is_h264_keyframe_(
-          field_trial::IsEnabled("WebRTC-SpsPpsIdrIsH264Keyframe")) {
+      sps_pps_idr_is_h264_keyframe_(false) {
   RTC_DCHECK_LE(start_buffer_size, max_buffer_size);
   // Buffer size must always be a power of 2.
   RTC_DCHECK((start_buffer_size & (start_buffer_size - 1)) == 0);
@@ -194,7 +192,9 @@
   MutexLock lock(&mutex_);
   return last_received_keyframe_packet_ms_;
 }
-
+void PacketBuffer::ForceSpsPpsIdrIsH264Keyframe() {
+  sps_pps_idr_is_h264_keyframe_ = true;
+}
 void PacketBuffer::ClearInternal() {
   for (auto& entry : buffer_) {
     entry = nullptr;

modules/video_coding/packet_buffer.h

diff --git a/modules/video_coding/packet_buffer.h b/modules/video_coding/packet_buffer.h
index 508fa83..160d8c7 100644
--- a/modules/video_coding/packet_buffer.h
+++ b/modules/video_coding/packet_buffer.h
@@ -94,6 +94,7 @@
       RTC_LOCKS_EXCLUDED(mutex_);
   absl::optional<int64_t> LastReceivedKeyframePacketMs() const
       RTC_LOCKS_EXCLUDED(mutex_);
+  void ForceSpsPpsIdrIsH264Keyframe();
 
  private:
   Clock* const clock_;
@@ -147,7 +148,7 @@
 
   // Indicates if we should require SPS, PPS, and IDR for a particular
   // RTP timestamp to treat the corresponding frame as a keyframe.
-  const bool sps_pps_idr_is_h264_keyframe_;
+  bool sps_pps_idr_is_h264_keyframe_;
 };
 
 }  // namespace video_coding

modules/video_coding/packet_buffer_unittest.cc

diff --git a/modules/video_coding/packet_buffer_unittest.cc b/modules/video_coding/packet_buffer_unittest.cc
index 242fff2..a01b480 100644
--- a/modules/video_coding/packet_buffer_unittest.cc
+++ b/modules/video_coding/packet_buffer_unittest.cc
@@ -100,9 +100,8 @@
 
 class PacketBufferTest : public ::testing::Test {
  protected:
-  explicit PacketBufferTest(std::string field_trials = "")
-      : scoped_field_trials_(field_trials),
-        rand_(0x7732213),
+  PacketBufferTest()
+      : rand_(0x7732213),
         clock_(0),
         packet_buffer_(&clock_, kStartSize, kMaxSize) {}
 
@@ -133,7 +132,6 @@
         packet_buffer_.InsertPacket(std::move(packet)));
   }
 
-  const test::ScopedFieldTrials scoped_field_trials_;
   Random rand_;
   SimulatedClock clock_;
   PacketBuffer packet_buffer_;
@@ -391,10 +389,11 @@
 class PacketBufferH264Test : public PacketBufferTest {
  protected:
   explicit PacketBufferH264Test(bool sps_pps_idr_is_keyframe)
-      : PacketBufferTest(sps_pps_idr_is_keyframe
-                             ? "WebRTC-SpsPpsIdrIsH264Keyframe/Enabled/"
-                             : ""),
-        sps_pps_idr_is_keyframe_(sps_pps_idr_is_keyframe) {}
+      : PacketBufferTest(), sps_pps_idr_is_keyframe_(sps_pps_idr_is_keyframe) {
+    if (sps_pps_idr_is_keyframe) {
+      packet_buffer_.ForceSpsPpsIdrIsH264Keyframe();
+    }
+  }
 
   PacketBufferInsertResult InsertH264(
       uint16_t seq_num,     // packet sequence number