Reland of Add a flags field to video timing extension.

webrtc/modules/video_coding/generic_encoder_unittest.cc

 /*
  *  Copyright (c) 2017 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.
  */
 
@@ skipping 13 matching lines @@
                         const int& i) {
   return min_frame_size + (s + 1) * i % (max_frame_size - min_frame_size);
 }
 
 class FakeEncodedImageCallback : public EncodedImageCallback {
  public:
   FakeEncodedImageCallback() : last_frame_was_timing_(false) {}
   Result OnEncodedImage(const EncodedImage& encoded_image,
                         const CodecSpecificInfo* codec_specific_info,
                         const RTPFragmentationHeader* fragmentation) override {
-    last_frame_was_timing_ = encoded_image.timing_.is_timing_frame;
+    last_frame_was_timing_ =
+        encoded_image.timing_.flags != TimingFrameFlags::kInvalid;
     return Result(Result::OK);
   };
 
   bool WasTimingFrame() { return last_frame_was_timing_; }
 
  private:
   bool last_frame_was_timing_;
 };
 
 enum class FrameType {
@@ skipping 112 matching lines @@
     for (int s = 0; s < kNumStreams; ++s) {
       if (FrameSize(kMinFrameSize, kMaxFrameSize, s, i) >=
           kAverageSize[s] * kDefaultOutlierFrameSizePercent / 100) {
         // Too big frame. May be dropped or timing, but not normal.
         EXPECT_NE(frames[s][i], FrameType::kNormal);
       }
     }
   }
 }
 
+TEST(TestVCMEncodedFrameCallback, NoTimingFrameIfNoEncodeStartTime) {
+  EncodedImage image;
+  CodecSpecificInfo codec_specific;
+  int64_t timestamp = 1;
+  image._length = 500;
+  image.capture_time_ms_ = timestamp;
+  codec_specific.codecType = kVideoCodecGeneric;
+  codec_specific.codecSpecific.generic.simulcast_idx = 0;
+  FakeEncodedImageCallback sink;
+  VCMEncodedFrameCallback callback(&sink, nullptr);
+  VideoCodec::TimingFrameTriggerThresholds thresholds;
+  thresholds.delay_ms = 1;  // Make all frames timing frames.
+  callback.SetTimingFramesThresholds(thresholds);
+
+  // Verify a single frame works with encode start time set.
+  callback.OnEncodeStarted(timestamp, 0);
+  callback.OnEncodedImage(image, &codec_specific, nullptr);
+  EXPECT_TRUE(sink.WasTimingFrame());
+
+  // New frame, now skip OnEncodeStarted. Should not result in timing frame.
+  image.capture_time_ms_ = ++timestamp;
+  callback.OnEncodedImage(image, &codec_specific, nullptr);
+  EXPECT_FALSE(sink.WasTimingFrame());
+}
+
 }  // namespace test
 }  // namespace webrtc