Adding video_coding_integrationtests test.

These changes makes it possible to run this tool with some gtest additions in an automated manner on the buildbots.

This test was previously known as video_coding_test, which is an
integration test that is mostly used as a development tool.

Parts of this test should be extracted and kept as a separate
development tool, but that's something for a future CL.

I also refactored the old command line parsing to use gflags instead.

Previous code from the following tests were merged into
video_coding_integrationtests and video_coding_unittests:
* video_codecs_test_framework_integrationtests
* video_codecs_test_framework_unittests
So these targets are now gone.

BUG=none
TEST=trybots passing + Executing video_coding_integrationtests on Linux, Mac and Windows since it's not currently added to the trybots. I ran with a couple of different combinations of settings.

Review URL: https://webrtc-codereview.appspot.com/933026

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3176 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/video_coding/codecs/test/video_codecs_test_framework.gypi

@@ -28,37 +28,6 @@
             'videoprocessor.cc',
           ],
         },
-        {
-          'target_name': 'video_codecs_test_framework_unittests',
-          'type': 'executable',
-          'dependencies': [
-            'video_codecs_test_framework',
-            'webrtc_video_coding',
-            '<(DEPTH)/testing/gmock.gyp:gmock',
-            '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-            '<(webrtc_root)/test/test.gyp:test_support_main',
-          ],
-          'sources': [
-            'packet_manipulator_unittest.cc',
-            'stats_unittest.cc',
-            'videoprocessor_unittest.cc',
-          ],
-        },
-        {
-          'target_name': 'video_codecs_test_framework_integrationtests',
-          'type': 'executable',
-          'dependencies': [
-            'video_codecs_test_framework',
-            'webrtc_video_coding',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-            '<(webrtc_root)/test/metrics.gyp:metrics',
-            '<(webrtc_root)/test/test.gyp:test_support_main',
-            '<(webrtc_vp8_dir)/vp8.gyp:webrtc_vp8',
-          ],
-          'sources': [
-            'videoprocessor_integrationtest.cc',
-          ],
-        },
       ], # targets
     }], # include_tests
   ], # conditions

webrtc/modules/video_coding/main/source/video_coding_test.gypi

@@ -8,16 +8,18 @@
 
 {
   'targets': [{
-      'target_name': 'video_coding_test',
+      'target_name': 'video_coding_integrationtests',
       'type': 'executable',
       'dependencies': [
+         'rtp_rtcp',
+         'video_codecs_test_framework',
+         'video_processing',
+         'webrtc_video_coding',
+         'webrtc_utility',
          '<(DEPTH)/testing/gtest.gyp:gtest',
+         '<(DEPTH)/third_party/google-gflags/google-gflags.gyp:google-gflags',
          '<(webrtc_root)/test/test.gyp:test_support',
          '<(webrtc_root)/test/metrics.gyp:metrics',
-         'webrtc_video_coding',
-         'rtp_rtcp',
-         'webrtc_utility',
-         'video_processing',
          '<(webrtc_root)/common_video/common_video.gyp:common_video',
       ],
       'include_dirs': [
@@ -61,12 +63,14 @@
         '../test/video_rtp_play_mt.cc',
         '../test/video_rtp_play.cc',
         '../test/video_source.cc',
-      ], # source
+        '../../codecs/test/videoprocessor_integrationtest.cc',
+      ], # sources
     },
     {
       'target_name': 'video_coding_unittests',
       'type': 'executable',
       'dependencies': [
+        'video_codecs_test_framework',
         'webrtc_video_coding',
         '<(webrtc_root)/test/test.gyp:test_support_main',
         '<(DEPTH)/testing/gtest.gyp:gtest',
@@ -85,6 +89,9 @@
         'video_coding_robustness_unittest.cc',
         'video_coding_impl_unittest.cc',
         'qm_select_unittest.cc',
+        '../../codecs/test/packet_manipulator_unittest.cc',
+        '../../codecs/test/stats_unittest.cc',
+        '../../codecs/test/videoprocessor_unittest.cc',
       ],
     },
   ],

webrtc/modules/video_coding/main/test/tester_main.cc

@@ -8,6 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "google/gflags.h"
+#include "gtest/gtest.h"
+
 #include "receiver_tests.h"
 #include "normal_test.h"
 #include "codec_database_test.h"
@@ -16,6 +19,8 @@
 #include "media_opt_test.h"
 #include "quality_modes_test.h"
 #include "test_util.h"
+#include "webrtc/test/test_suite.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -24,6 +29,26 @@
 //#include "vld.h"
 #endif
 
+DEFINE_string(codec, "VP8", "Codec to use (VP8 or I420).");
+DEFINE_int32(width, 352, "Width in pixels of the frames in the input file.");
+DEFINE_int32(height, 288, "Height in pixels of the frames in the input file.");
+DEFINE_int32(bitrate, 500, "Bit rate in kilobits/second.");
+DEFINE_int32(framerate, 30, "Frame rate of the input file, in FPS "
+             "(frames-per-second). ");
+DEFINE_int32(packet_loss_percent, 0, "Packet loss probability, in percent.");
+DEFINE_int32(rtt, 0, "RTT (round-trip time), in milliseconds.");
+DEFINE_int32(protection_mode, 0, "Protection mode.");
+DEFINE_int32(cama_enable, 0, "Cama enable.");
+DEFINE_string(input_filename, webrtc::test::ProjectRootPath() +
+              "/resources/foreman_cif.yuv", "Input file.");
+DEFINE_string(output_filename, webrtc::test::OutputPath() +
+              "video_coding_test_output_352x288.yuv", "Output file.");
+DEFINE_string(fv_output_filename, webrtc::test::OutputPath() +
+              "features.txt", "FV output file.");
+DEFINE_int32(test_number, 0, "Test number.");
+DEFINE_bool(run_gtest_tests, true, "Run gtest tests too (after legacy tests has"
+            " executed).");
+
 using namespace webrtc;
 
 /*
@@ -34,137 +59,47 @@ using namespace webrtc;
 int vcmMacrosTests = 0;
 int vcmMacrosErrors = 0;
 
-int ParseArguments(int argc, char **argv, CmdArgs& args)
+int ParseArguments(CmdArgs& args) {
-{
+  args.width = FLAGS_width;
-    int i = 1;
+  args.height = FLAGS_height;
-
+  args.bitRate = FLAGS_bitrate;
-    while (i < argc)
+  args.frameRate = FLAGS_framerate;
-    {
+  if (args.width  < 1 || args.height < 1 || args.bitRate < 1 ||
-      if (argv[i+1] == '\0')
+      args.frameRate < 1) {
-      {
+    return -1;
-        printf( "You did not supply a parameter value\n." );
+  }
-        return -1;
+  args.codecName = FLAGS_codec;
-      }
+  if (args.codecName == "VP8") {
-
+    args.codecType = kVideoCodecVP8;
-      if (argv[i][0] != '-')
+  } else if (args.codecName == "I420") {
-      {
+    args.codecType = kVideoCodecI420;
-          return -1;
+  } else {
-      }
+    printf("Invalid codec: %s\n", args.codecName.c_str());
-      switch (argv[i][1])
+    return -1;
-      {
+  }
-      case 'w':
+  args.inputFile = FLAGS_input_filename;
-      {
+  args.outputFile = FLAGS_output_filename;
-          int w = atoi(argv[i+1]);
+  args.testNum = FLAGS_test_number;
-          if (w < 1)
+  args.packetLoss = FLAGS_packet_loss_percent;
-              return -1;
+  args.rtt = FLAGS_rtt;
-          args.width = w;
+  args.protectionMode = FLAGS_protection_mode;
-          break;
+  args.camaEnable = FLAGS_cama_enable;
-      }
+  args.fv_outputfile = FLAGS_fv_output_filename;
-      case 'h':
+  return 0;
-      {
-          int h = atoi(argv[i+1]);
-          if (h < 1)
-              return -1;
-          args.height = h;
-          break;
-      }
-      case 'b':
-      {
-          int b = atoi(argv[i+1]);
-          if (b < 1)
-              return -1;
-          args.bitRate = b;
-          break;
-      }
-      case 'f':
-      {
-          int f = atoi(argv[i+1]);
-          if (f < 1)
-              return -1;
-          args.frameRate = f;
-          break;
-      }
-      case 'c':
-      {
-          // TODO(holmer): This should be replaced with a map if more codecs
-          // are added
-          args.codecName = argv[i+1];
-          if (strncmp(argv[i+1], "VP8", 3) == 0)
-          {
-              args.codecType = kVideoCodecVP8;
-          }
-          else if (strncmp(argv[i+1], "I420", 4) == 0)
-          {
-              args.codecType = kVideoCodecI420;
-          }
-          else
-              return -1;
-
-          break;
-      }
-      case 'i':
-      {
-          args.inputFile = argv[i+1];
-          break;
-      }
-      case 'o':
-          args.outputFile = argv[i+1];
-          break;
-      case 'n':
-      {
-          int n = atoi(argv[i+1]);
-          if (n < 1)
-              return -1;
-          args.testNum = n;
-          break;
-      }
-      case 'p':
-      {
-          args.packetLoss = atoi(argv[i+1]);
-          break;
-      }
-      case 'r':
-      {
-          args.rtt = atoi(argv[i+1]);
-          break;
-      }
-      case 'm':
-      {
-          args.protectionMode = atoi(argv[i+1]);
-          break;
-      }
-      case 'e':
-      {
-          args.camaEnable = atoi(argv[i+1]);
-          break;
-      }
-      case 'v':
-      {
-          args.fv_outputfile = argv[i+1];
-          break;
-      }
-      default:
-          return -1;
-      }
-      i += 2;
-    }
-    return 0;
 }
 
-int main(int argc, char **argv)
+int main(int argc, char **argv) {
-{
+  // Initialize WebRTC fileutils.h so paths to resources can be resolved.
-  CmdArgs args;
+  webrtc::test::SetExecutablePath(argv[0]);
+  google::ParseCommandLineFlags(&argc, &argv, true);
 
-  if (ParseArguments(argc, argv, args) != 0)
+  CmdArgs args;
-  {
+  if (ParseArguments(args) != 0) {
     printf("Unable to parse input arguments\n");
-    printf("args: -n <test #> -w <width> -h <height> -f <fps> -b <bps> "
-           "-c <codec>  -i <input file> -o <output file> -p <packet loss> "
-           "-r <round-trip-time> -e <cama enable> -m <protection mode> "
-           "-v <feature vector output file>\n");
     return -1;
   }
 
+  printf("Running legacy video coding tests...\n");
   int ret = 0;
   switch (args.testNum) {
     case 0:
@@ -211,13 +146,14 @@ int main(int argc, char **argv)
       ret = -1;
       break;
   }
-  if (ret != 0)
+  if (ret != 0) {
-  {
+    printf("Legacy Tests failed!\n");
-    printf("Test failed!\n");
+  } else {
-    return -1;
+    if (FLAGS_run_gtest_tests) {
+      printf("Running gtest integration tests...\n");
+      webrtc::test::TestSuite test_suite(argc, argv);
+      ret = test_suite.Run();
+    }
   }
-  return 0;
+  return ret;
 }
-
-
-