New method TimestampAligner::TranslateTimestamp

webrtc/media/base/videocapturer.cc

 /*
  *  Copyright (c) 2010 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 207 matching lines @@
                                int height,
                                int64_t camera_time_us,
                                int64_t system_time_us,
                                int* out_width,
                                int* out_height,
                                int* crop_width,
                                int* crop_height,
                                int* crop_x,
                                int* crop_y,
                                int64_t* translated_camera_time_us) {
-  int64_t offset_us =
-      translated_camera_time_us
-          ? timestamp_aligner_.UpdateOffset(camera_time_us, system_time_us)
-          : 0;
-
+  if (translated_camera_time_us) {
+    *translated_camera_time_us =
+        timestamp_aligner_.TranslateTimestamp(camera_time_us, system_time_us);
+  }
   if (!broadcaster_.frame_wanted()) {
     return false;
   }
 
   if (enable_video_adapter_ && !IsScreencast()) {
     if (!video_adapter_.AdaptFrameResolution(
             width, height, camera_time_us * rtc::kNumNanosecsPerMicrosec,

[perkj_webrtc, 2016/09/12 09:33:46]

use translated time?

             crop_width, crop_height, out_width, out_height)) {
       // VideoAdapter dropped the frame.
       return false;
     }
     *crop_x = (width - *crop_width) / 2;
     *crop_y = (height - *crop_height) / 2;
   } else {
     *out_width = width;
     *out_height = height;
     *crop_width = width;
     *crop_height = height;
     *crop_x = 0;
     *crop_y = 0;
   }
 
-  if (translated_camera_time_us) {
-    *translated_camera_time_us = timestamp_aligner_.ClipTimestamp(
-        camera_time_us + offset_us, system_time_us);
-  }
   return true;
 }
 
 void VideoCapturer::OnFrameCaptured(VideoCapturer*,
                                     const CapturedFrame* captured_frame) {
   int out_width;
   int out_height;
   int crop_width;
   int crop_height;
   int crop_x;
@@ skipping 182 matching lines @@
 void VideoCapturer::UpdateInputSize(int width, int height) {
   // Update stats protected from fetches from different thread.
   rtc::CritScope cs(&frame_stats_crit_);
 
   input_size_valid_ = true;
   input_width_ = width;
   input_height_ = height;
 }
 
 }  // namespace cricket