Use std::unique_ptr in VideoProcessorIntegrationTest.

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.
  */
 
 #include "webrtc/modules/video_coding/codecs/test/videoprocessor.h"
 
 #include <string.h>
 
 #include <limits>
 #include <memory>
 #include <utility>
 #include <vector>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/timeutils.h"
 #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 {
+std::string CodecTypeToString(VideoCodecType codec_type) {
+  switch (codec_type) {
+    case kVideoCodecVP8:
+      return "VP8";
+    case kVideoCodecVP9:
+      return "VP9";
+    case kVideoCodecH264:
+      return "H264";
+    default:
+      RTC_NOTREACHED();
+      return "";
+  }
+}

[sprang_webrtc, 2017/02/07 09:18:36]

Maybe use CodecTypeToPayloadName() from webrtc/common_types.h instead?

[åsapersson, 2017/02/07 09:39:34]

Done.

+}  // namespace
 
 TestConfig::TestConfig()
     : name(""),
       description(""),
       test_number(0),
       input_filename(""),
       output_filename(""),
       output_dir("out"),
       networking_config(),
       exclude_frame_types(kExcludeOnlyFirstKeyFrame),
@@ skipping 100 matching lines @@
     fprintf(stderr, "Failed to initialize VideoDecoder, return code: %d\n",
             init_result);
     return false;
   }
 
   if (config_.verbose) {
     printf("Video Processor:\n");
     printf("  #CPU cores used  : %d\n", nbr_of_cores);
     printf("  Total # of frames: %d\n", frame_reader_->NumberOfFrames());
     printf("  Codec settings:\n");
-    printf("    Start bitrate  : %d kbps\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("    Width            : %d\n", config_.codec_settings->width);
+    printf("    Height           : %d\n", config_.codec_settings->height);
+    printf("    Codec type       : %s\n",
+           CodecTypeToString(config_.codec_settings->codecType).c_str());
+    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);
+    }
   }
   initialized_ = true;
   return true;
 }
 
 VideoProcessorImpl::~VideoProcessorImpl() {
   delete[] last_successful_frame_buffer_;
   encoder_->RegisterEncodeCompleteCallback(NULL);
   delete encode_callback_;
   decoder_->RegisterDecodeCompleteCallback(NULL);
@@ skipping 255 matching lines @@
 }
 int32_t VideoProcessorImpl::VideoProcessorDecodeCompleteCallback::Decoded(
     VideoFrame& image) {
   // Forward to parent class.
   video_processor_->FrameDecoded(image);
   return 0;
 }
 
 }  // namespace test
 }  // namespace webrtc