Minor changes in videoprocessor and videoprocessor_integrationtests.h

webrtc/modules/video_coding/codecs/test/videoprocessor.cc

 /*
  *  Copyright (c) 2012 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 @@
 #include "webrtc/modules/video_coding/include/video_codec_initializer.h"
 #include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h"
 #include "webrtc/modules/video_coding/utility/simulcast_rate_allocator.h"
 #include "webrtc/system_wrappers/include/cpu_info.h"
 
 namespace webrtc {
 namespace test {
 
 namespace {
 const int k90khzTimestampFrameDiff = 3000;  // Assuming 30 fps.
+
+void PrintCodecSettings(const VideoCodec* config) {
+  printf("    Start bitrate    : %d kbps\n", config->startBitrate);
+  printf("    Width            : %d\n", config->width);
+  printf("    Height           : %d\n", config->height);
+  printf("    Codec type       : %s\n",
+         CodecTypeToPayloadName(config->codecType).value_or("Unknown"));
+  if (config->codecType == kVideoCodecVP8) {
+    printf("    Denoising        : %d\n", config->VP8().denoisingOn);
+    printf("    Error concealment: %d\n", config->VP8().errorConcealmentOn);
+    printf("    Frame dropping   : %d\n", config->VP8().frameDroppingOn);
+    printf("    Resilience       : %d\n", config->VP8().resilience);
+  } else if (config->codecType == kVideoCodecVP9) {
+    printf("    Denoising        : %d\n", config->VP9().denoisingOn);
+    printf("    Frame dropping   : %d\n", config->VP9().frameDroppingOn);
+    printf("    Resilience       : %d\n", config->VP9().resilience);
+  }
+}
+
+int GetElapsedTimeMicroseconds(int64_t start_ns, int64_t stop_ns) {
+  int64_t diff_us = (stop_ns - start_ns) / rtc::kNumNanosecsPerMicrosec;
+  RTC_DCHECK_GE(diff_us, std::numeric_limits<int>::min());
+  RTC_DCHECK_LE(diff_us, std::numeric_limits<int>::max());
+  return static_cast<int>(diff_us);
+}
 }  // namespace
 
 const char* ExcludeFrameTypesToStr(ExcludeFrameTypes e) {
   switch (e) {
     case kExcludeOnlyFirstKeyFrame:
       return "ExcludeOnlyFirstKeyFrame";
     case kExcludeAllKeyFrames:
       return "ExcludeAllKeyFrames";
     default:
       RTC_NOTREACHED();
@@ skipping 101 matching lines @@
   RTC_CHECK_EQ(decoder_->InitDecode(config_.codec_settings, num_cores),
                WEBRTC_VIDEO_CODEC_OK)
       << "Failed to initialize VideoDecoder";
 
   if (config_.verbose) {
     printf("Video Processor:\n");
     printf("  #CPU cores used  : %d\n", num_cores);
     printf("  Total # of frames: %d\n",
            analysis_frame_reader_->NumberOfFrames());
     printf("  Codec settings:\n");
-    printf("    Start bitrate    : %d kbps\n",
-           config_.codec_settings->startBitrate);
-    printf("    Width            : %d\n", config_.codec_settings->width);
-    printf("    Height           : %d\n", config_.codec_settings->height);
-    printf("    Codec type       : %s\n",
-           CodecTypeToPayloadName(config_.codec_settings->codecType)
-               .value_or("Unknown"));
     printf("    Encoder implementation name: %s\n",
            encoder_->ImplementationName());
     printf("    Decoder implementation name: %s\n",
            decoder_->ImplementationName());
-    if (config_.codec_settings->codecType == kVideoCodecVP8) {
-      printf("    Denoising        : %d\n",
-             config_.codec_settings->VP8()->denoisingOn);
-      printf("    Error concealment: %d\n",
-             config_.codec_settings->VP8()->errorConcealmentOn);
-      printf("    Frame dropping   : %d\n",
-             config_.codec_settings->VP8()->frameDroppingOn);
-      printf("    Resilience       : %d\n",
-             config_.codec_settings->VP8()->resilience);
-    } else if (config_.codec_settings->codecType == kVideoCodecVP9) {
-      printf("    Resilience       : %d\n",
-             config_.codec_settings->VP9()->resilience);
-    }
+    PrintCodecSettings(config_.codec_settings);
   }
   initialized_ = true;
   return true;
 }
 
 VideoProcessorImpl::~VideoProcessorImpl() {
   encoder_->RegisterEncodeCompleteCallback(nullptr);
   decoder_->RegisterDecodeCompleteCallback(nullptr);
 }
 
@@ skipping 260 matching lines @@
     memcpy(last_successful_frame_buffer_.get(), image_buffer.get(),
            extracted_length);
 
     RTC_CHECK(analysis_frame_writer_->WriteFrame(image_buffer.get()));
     if (decoded_frame_writer_) {
       RTC_CHECK(decoded_frame_writer_->WriteFrame(image_buffer.get()));
     }
   }
 }
 
-int VideoProcessorImpl::GetElapsedTimeMicroseconds(int64_t start,
-                                                   int64_t stop) {
-  int64_t encode_time = (stop - start) / rtc::kNumNanosecsPerMicrosec;
-  RTC_DCHECK_GE(encode_time, std::numeric_limits<int>::min());
-  RTC_DCHECK_LE(encode_time, std::numeric_limits<int>::max());
-  return static_cast<int>(encode_time);
-}
-
 }  // namespace test
 }  // namespace webrtc