Use webrtc::VideoFrame timestamp in RTCVideoEncoder

media/gpu/video_encode_accelerator_unittest.cc

Index: media/gpu/video_encode_accelerator_unittest.cc
diff --git a/media/gpu/video_encode_accelerator_unittest.cc b/media/gpu/video_encode_accelerator_unittest.cc
index 7ba3fe8d83e6ef8be99a1efb7b94f6d108a7a73a..644934f967566e1d79800b2a3709af358b865c63 100644
--- a/media/gpu/video_encode_accelerator_unittest.cc
+++ b/media/gpu/video_encode_accelerator_unittest.cc
@@ -964,6 +964,9 @@ class VEAClient : public VideoEncodeAccelerator::Client {
   // Number of encoded frames we've got from the encoder thus far.
   unsigned int num_encoded_frames_;
 
+  // Number of encoded nal units.
+  unsigned int num_encoded_nalus_;
+
   // Frames since last bitrate verification.
   unsigned int num_frames_since_last_check_;
 
@@ -1061,6 +1064,7 @@ VEAClient::VEAClient(TestStream* test_stream,
       output_buffer_size_(0),
       num_frames_to_encode_(0),
       num_encoded_frames_(0),
+      num_encoded_nalus_(0),
       num_frames_since_last_check_(0),
       seen_keyframe_in_this_buffer_(false),
       save_to_file_(save_to_file),
@@ -1533,7 +1537,13 @@ bool VEAClient::HandleEncodedFrame(bool keyframe) {
     encode_latencies_.push_back(last_frame_ready_time_ - start_time);
   }
 
-  ++num_encoded_frames_;
+  // H264 encoder sends multiple NAL units, 2 per frame.
+  if (test_stream_->requested_profile == H264PROFILE_BASELINE) {
+    ++num_encoded_nalus_;
+    num_encoded_frames_ = num_encoded_nalus_ / 2;

[wuchengli, 2016/08/03 14:03:57]

Hmm. Maybe we should increase num_encoded_frames_ only when BitstreamBufferReady
returns a timestamp different from the last one. Let me discuss with Pawel
tomorrow.

[wuchengli, 2016/08/05 02:10:28]

I discussed with Pawel. Normally we get one slice NAL. Sometimes we may get
multiple. But in general this may be any number of NALUs. We can't make any
assumptions about this. For example, we could get 20 type 6 NALUs or 10 SPSes in
a row. All is valid and up to spec.

The solution is we should only increase num_encoded_frames_ when the timestamps
of BitstreamBufferReady is different from the last one. In
VEAClient::CreateFrame (line 1433), we make sure the timestamps of every input
buffer is different. We can count the number of timestamps of
BitstreamBufferReady to know num_encoded_frames_.

The increment of num_encoded_frames_ should be moved to
VEAClient::BitstreamBufferReady because we have timetsamps information there.

+  } else {
+    ++num_encoded_frames_;
+  }
   ++num_frames_since_last_check_;
 
   // Because the keyframe behavior requirements are loose, we give
@@ -1836,6 +1846,15 @@ INSTANTIATE_TEST_CASE_P(MultipleEncoders,
                                                           false,
                                                           false,
                                                           false)));
+
+#if defined(OS_MACOSX)
+INSTANTIATE_TEST_CASE_P(
+    VerifyTimestamp,
+    VideoEncodeAcceleratorTest,
+    ::testing::Values(
+        std::make_tuple(1, false, 0, false, false, false, false, false, true)));
+#endif  // defined(OS_MACOSX)
+
 #if defined(OS_WIN)
 INSTANTIATE_TEST_CASE_P(
     ForceBitrate,