Removing VCMCodecDataBase::Codec and VideoCodingModule::Codec.

webrtc/modules/video_coding/codecs/tools/video_quality_measurement.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/codecs/test/packet_manipulator.h"
 #include "webrtc/modules/video_coding/codecs/test/stats.h"
 #include "webrtc/modules/video_coding/codecs/test/videoprocessor.h"
 #include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
 #include "webrtc/modules/video_coding/include/video_coding.h"
 #include "webrtc/rtc_base/format_macros.h"
 #include "webrtc/test/testsupport/frame_reader.h"
 #include "webrtc/test/testsupport/frame_writer.h"
 #include "webrtc/test/testsupport/metrics/video_metrics.h"
 #include "webrtc/test/testsupport/packet_reader.h"
+#include "webrtc/test/video_codec_settings.h"
 
 DEFINE_string(test_name, "Quality test", "The name of the test to run. ");
 DEFINE_string(test_description,
               "",
               "A more detailed description about what "
               "the current test is about.");
 DEFINE_string(input_filename,
               "",
               "Input file. "
               "The source video file to be encoded and decoded. Must be in "
@@ skipping 153 matching lines @@
     fprintf(stderr, "Cannot write output file: %s\n",
             config->output_filename.c_str());
     return 4;
   }
   fclose(test_file);
 
   // Check single core flag.
   config->use_single_core = FLAGS_use_single_core;
 
   // Get codec specific configuration.
-  webrtc::VideoCodingModule::Codec(webrtc::kVideoCodecVP8,
-                                   &config->codec_settings);
+  webrtc::test::CodecSettings(webrtc::kVideoCodecVP8, &config->codec_settings);
 
   // Check the temporal layers.
   if (FLAGS_temporal_layers < 0 ||
       FLAGS_temporal_layers > webrtc::kMaxTemporalStreams) {
     fprintf(stderr, "Temporal layers number must be 0-4, was: %d\n",
             FLAGS_temporal_layers);
     return 13;
   }
   config->codec_settings.VP8()->numberOfTemporalLayers = FLAGS_temporal_layers;
 
@@ skipping 325 matching lines @@
   }
   if (FLAGS_python) {
     PrintPythonOutput(config, stats, ssim_result, psnr_result);
   }
   delete processor;
   delete encoder;
   delete decoder;
   Log("Quality test finished!");
   return 0;
 }