Merge video_engine_core into webrtc target.

Merges the two video targets since video_engine is no longer usable
standalone.

BUG=webrtc:1695
R=mflodman@webrtc.org, stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1184763009.

Cr-Commit-Position: refs/heads/master@{#9479}

webrtc/BUILD.gn

@@ -195,7 +195,6 @@ source_set("webrtc") {
     "system_wrappers",
     "tools",
     "video",
-    "video_engine",
     "voice_engine",
   ]
 

webrtc/base/base.gyp

@@ -63,6 +63,8 @@
         'platform_file.h',
         'platform_thread.cc',
         'platform_thread.h',
+        'ratetracker.cc',
+        'ratetracker.h',
         'safe_conversions.h',
         'safe_conversions_impl.h',
         'stringencode.cc',
@@ -240,8 +242,6 @@
         'proxyserver.h',
         'ratelimiter.cc',
         'ratelimiter.h',
-        'ratetracker.cc',
-        'ratetracker.h',
         'refcount.h',
         'referencecountedsingletonfactory.h',
         'rollingaccumulator.h',

webrtc/build/apk_tests.gyp

@@ -153,7 +153,7 @@
         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)video_engine_core_unittests<(SHARED_LIB_SUFFIX)',
       },
       'dependencies': [
-        '<(webrtc_root)/video_engine/video_engine.gyp:video_engine_core_unittests',
+        '<(webrtc_root)/video_engine/video_engine_core_unittests.gyp:video_engine_core_unittests',
       ],
       'includes': [
         '../../build/apk_test.gypi',

webrtc/video/BUILD.gn

@@ -10,6 +10,33 @@ import("../build/webrtc.gni")
 
 source_set("video") {
   sources = [
+    "../video_engine/call_stats.cc",
+    "../video_engine/call_stats.h",
+    "../video_engine/encoder_state_feedback.cc",
+    "../video_engine/encoder_state_feedback.h",
+    "../video_engine/overuse_frame_detector.cc",
+    "../video_engine/overuse_frame_detector.h",
+    "../video_engine/payload_router.cc",
+    "../video_engine/payload_router.h",
+    "../video_engine/report_block_stats.cc",
+    "../video_engine/report_block_stats.h",
+    "../video_engine/stream_synchronization.cc",
+    "../video_engine/stream_synchronization.h",
+    "../video_engine/vie_capturer.cc",
+    "../video_engine/vie_capturer.h",
+    "../video_engine/vie_channel.cc",
+    "../video_engine/vie_channel.h",
+    "../video_engine/vie_channel_group.cc",
+    "../video_engine/vie_channel_group.h",
+    "../video_engine/vie_defines.h",
+    "../video_engine/vie_encoder.cc",
+    "../video_engine/vie_encoder.h",
+    "../video_engine/vie_receiver.cc",
+    "../video_engine/vie_receiver.h",
+    "../video_engine/vie_remb.cc",
+    "../video_engine/vie_remb.h",
+    "../video_engine/vie_sync_module.cc",
+    "../video_engine/vie_sync_module.h",
     "audio_receive_stream.cc",
     "audio_receive_stream.h",
     "call.cc",
@@ -40,6 +67,15 @@ source_set("video") {
 
   deps = [
     "..:webrtc_common",
-    "../video_engine:video_engine_core",
+    "../common_video",
+    "../modules/bitrate_controller",
+    "../modules/rtp_rtcp",
+    "../modules/utility",
+    "../modules/video_capture:video_capture_module",
+    "../modules/video_coding",
+    "../modules/video_processing",
+    "../modules/video_render:video_render_module",
+    "../voice_engine",
+    "../system_wrappers",
   ]
 }

webrtc/video/webrtc_video.gypi

@@ -8,7 +8,18 @@
 {
   'variables': {
     'webrtc_video_dependencies': [
-      '<(webrtc_root)/video_engine/video_engine.gyp:video_engine_core',
+      '<(webrtc_root)/base/base.gyp:rtc_base_approved',
+      '<(webrtc_root)/common.gyp:webrtc_common',
+      '<(webrtc_root)/common_video/common_video.gyp:common_video',
+      '<(webrtc_root)/modules/modules.gyp:bitrate_controller',
+      '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
+      '<(webrtc_root)/modules/modules.gyp:video_capture_module',
+      '<(webrtc_root)/modules/modules.gyp:video_processing',
+      '<(webrtc_root)/modules/modules.gyp:video_render_module',
+      '<(webrtc_root)/modules/modules.gyp:webrtc_utility',
+      '<(webrtc_root)/modules/modules.gyp:webrtc_video_coding',
+      '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
+      '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
     ],
     'webrtc_video_sources': [
       'video/audio_receive_stream.cc',
@@ -16,10 +27,10 @@
       'video/call.cc',
       'video/encoded_frame_callback_adapter.cc',
       'video/encoded_frame_callback_adapter.h',
-      'video/send_statistics_proxy.cc',
-      'video/send_statistics_proxy.h',
       'video/receive_statistics_proxy.cc',
       'video/receive_statistics_proxy.h',
+      'video/send_statistics_proxy.cc',
+      'video/send_statistics_proxy.h',
       'video/transport_adapter.cc',
       'video/transport_adapter.h',
       'video/video_decoder.cc',
@@ -28,6 +39,33 @@
       'video/video_receive_stream.h',
       'video/video_send_stream.cc',
       'video/video_send_stream.h',
+      'video_engine/call_stats.cc',
+      'video_engine/call_stats.h',
+      'video_engine/encoder_state_feedback.cc',
+      'video_engine/encoder_state_feedback.h',
+      'video_engine/overuse_frame_detector.cc',
+      'video_engine/overuse_frame_detector.h',
+      'video_engine/payload_router.cc',
+      'video_engine/payload_router.h',
+      'video_engine/report_block_stats.cc',
+      'video_engine/report_block_stats.h',
+      'video_engine/stream_synchronization.cc',
+      'video_engine/stream_synchronization.h',
+      'video_engine/vie_capturer.cc',
+      'video_engine/vie_capturer.h',
+      'video_engine/vie_channel.cc',
+      'video_engine/vie_channel.h',
+      'video_engine/vie_channel_group.cc',
+      'video_engine/vie_channel_group.h',
+      'video_engine/vie_defines.h',
+      'video_engine/vie_encoder.cc',
+      'video_engine/vie_encoder.h',
+      'video_engine/vie_receiver.cc',
+      'video_engine/vie_receiver.h',
+      'video_engine/vie_remb.cc',
+      'video_engine/vie_remb.h',
+      'video_engine/vie_sync_module.cc',
+      'video_engine/vie_sync_module.h',
     ],
   },
 }

webrtc/video_engine/BUILD.gn

@@ -1,70 +0,0 @@
-# Copyright (c) 2014 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.
-
-import("../build/webrtc.gni")
-
-source_set("video_engine") {
-  deps = [
-    ":video_engine_core",
-  ]
-}
-
-source_set("video_engine_core") {
-  sources = [
-    "call_stats.cc",
-    "call_stats.h",
-    "encoder_state_feedback.cc",
-    "encoder_state_feedback.h",
-    "overuse_frame_detector.cc",
-    "overuse_frame_detector.h",
-    "payload_router.cc",
-    "payload_router.h",
-    "report_block_stats.cc",
-    "report_block_stats.h",
-    "stream_synchronization.cc",
-    "stream_synchronization.h",
-    "vie_capturer.cc",
-    "vie_capturer.h",
-    "vie_channel.cc",
-    "vie_channel.h",
-    "vie_channel_group.cc",
-    "vie_channel_group.h",
-    "vie_defines.h",
-    "vie_encoder.cc",
-    "vie_encoder.h",
-    "vie_receiver.cc",
-    "vie_receiver.h",
-    "vie_remb.cc",
-    "vie_remb.h",
-    "vie_sync_module.cc",
-    "vie_sync_module.h",
-  ]
-
-  configs += [ "..:common_config" ]
-  public_configs = [ "..:common_inherited_config" ]
-
-  if (is_clang) {
-    # Suppress warnings from Chrome's Clang plugins.
-    # See http://code.google.com/p/webrtc/issues/detail?id=163 for details.
-    configs -= [ "//build/config/clang:find_bad_constructs" ]
-  }
-
-  deps = [
-    "..:webrtc_common",
-    "../common_video",
-    "../modules/bitrate_controller",
-    "../modules/rtp_rtcp",
-    "../modules/utility",
-    "../modules/video_capture:video_capture_module",
-    "../modules/video_coding",
-    "../modules/video_processing",
-    "../modules/video_render:video_render_module",
-    "../voice_engine",
-    "../system_wrappers",
-  ]
-}

webrtc/video_engine/video_engine.gyp

@@ -1,15 +0,0 @@
-# Copyright (c) 2011 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.
-
-{
-  'includes': [
-    '../build/common.gypi',
-    './video_engine_core.gypi',
-  ],
-}
-

webrtc/video_engine/video_engine_core.gypi

@@ -1,137 +0,0 @@
-# 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.
-
-{
-  'targets': [
-    {
-      'target_name': 'video_engine_core',
-      'type': 'static_library',
-      'dependencies': [
-        '<(webrtc_root)/common.gyp:webrtc_common',
-
-        # common_video
-       '<(webrtc_root)/common_video/common_video.gyp:common_video',
-
-        # ModulesShared
-        '<(webrtc_root)/modules/modules.gyp:rtp_rtcp',
-        '<(webrtc_root)/modules/modules.gyp:webrtc_utility',
-
-        # ModulesVideo
-        '<(webrtc_root)/modules/modules.gyp:bitrate_controller',
-        '<(webrtc_root)/modules/modules.gyp:video_capture_module',
-        '<(webrtc_root)/modules/modules.gyp:webrtc_video_coding',
-        '<(webrtc_root)/modules/modules.gyp:video_processing',
-        '<(webrtc_root)/modules/modules.gyp:video_render_module',
-
-        # VoiceEngine
-        '<(webrtc_root)/voice_engine/voice_engine.gyp:voice_engine',
-
-        # system_wrappers
-        '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
-      ],
-      'sources': [
-        # headers
-        'call_stats.h',
-        'encoder_state_feedback.h',
-        'overuse_frame_detector.h',
-        'payload_router.h',
-        'report_block_stats.h',
-        'stream_synchronization.h',
-        'vie_defines.h',
-        'vie_remb.h',
-        'vie_capturer.h',
-        'vie_channel.h',
-        'vie_channel_group.h',
-        'vie_encoder.h',
-        'vie_receiver.h',
-        'vie_sync_module.h',
-
-        # ViE
-        'call_stats.cc',
-        'encoder_state_feedback.cc',
-        'overuse_frame_detector.cc',
-        'payload_router.cc',
-        'report_block_stats.cc',
-        'stream_synchronization.cc',
-        'vie_capturer.cc',
-        'vie_channel.cc',
-        'vie_channel_group.cc',
-        'vie_encoder.cc',
-        'vie_receiver.cc',
-        'vie_remb.cc',
-        'vie_sync_module.cc',
-      ], # source
-    },
-  ], # targets
-  'conditions': [
-    ['include_tests==1', {
-      'targets': [
-        {
-          'target_name': 'video_engine_core_unittests',
-          'type': '<(gtest_target_type)',
-          'dependencies': [
-            'video_engine_core',
-            '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl',
-            '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-            '<(DEPTH)/testing/gmock.gyp:gmock',
-            '<(webrtc_root)/test/test.gyp:test_support_main',
-          ],
-          'sources': [
-            'call_stats_unittest.cc',
-            'encoder_state_feedback_unittest.cc',
-            'overuse_frame_detector_unittest.cc',
-            'payload_router_unittest.cc',
-            'report_block_stats_unittest.cc',
-            'stream_synchronization_unittest.cc',
-            'vie_capturer_unittest.cc',
-            'vie_codec_unittest.cc',
-            'vie_remb_unittest.cc',
-          ],
-          'conditions': [
-            ['OS=="android"', {
-              'dependencies': [
-                '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
-              ],
-            }],
-          ],
-        },
-      ], # targets
-      'conditions': [
-        ['OS=="android"', {
-          'targets': [
-            {
-              'target_name': 'video_engine_core_unittests_apk_target',
-              'type': 'none',
-              'dependencies': [
-                '<(apk_tests_path):video_engine_core_unittests_apk',
-              ],
-            },
-          ],
-        }],
-        ['test_isolation_mode != "noop"', {
-          'targets': [
-            {
-              'target_name': 'video_engine_core_unittests_run',
-              'type': 'none',
-              'dependencies': [
-                'video_engine_core_unittests',
-              ],
-              'includes': [
-                '../build/isolate.gypi',
-              ],
-              'sources': [
-                'video_engine_core_unittests.isolate',
-              ],
-            },
-          ],
-        }],
-      ],
-    }], # include_tests
-  ], # conditions
-}

webrtc/video_engine/video_engine_core_unittests.gyp

@@ -0,0 +1,75 @@
+# 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.
+
+{
+  'includes': [
+    '../build/common.gypi',
+  ],
+  'targets': [
+    {
+      'target_name': 'video_engine_core_unittests',
+      'type': '<(gtest_target_type)',
+      'dependencies': [
+        '<(webrtc_root)/webrtc.gyp:webrtc',
+        '<(webrtc_root)/modules/modules.gyp:video_capture_module_internal_impl',
+        '<(webrtc_root)/modules/modules.gyp:video_render_module_internal_impl',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+        '<(DEPTH)/testing/gmock.gyp:gmock',
+        '<(webrtc_root)/test/test.gyp:test_support_main',
+      ],
+      'sources': [
+        'call_stats_unittest.cc',
+        'encoder_state_feedback_unittest.cc',
+        'overuse_frame_detector_unittest.cc',
+        'payload_router_unittest.cc',
+        'report_block_stats_unittest.cc',
+        'stream_synchronization_unittest.cc',
+        'vie_capturer_unittest.cc',
+        'vie_codec_unittest.cc',
+        'vie_remb_unittest.cc',
+      ],
+      'conditions': [
+        ['OS=="android"', {
+          'dependencies': [
+            '<(DEPTH)/testing/android/native_test.gyp:native_test_native_code',
+          ],
+        }],
+      ],
+    },
+  ], # targets
+  'conditions': [
+    ['OS=="android"', {
+      'targets': [
+        {
+          'target_name': 'video_engine_core_unittests_apk_target',
+          'type': 'none',
+          'dependencies': [
+            '<(apk_tests_path):video_engine_core_unittests_apk',
+          ],
+        },
+      ],
+    }],
+    ['test_isolation_mode != "noop"', {
+      'targets': [
+        {
+          'target_name': 'video_engine_core_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'video_engine_core_unittests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+          ],
+          'sources': [
+            'video_engine_core_unittests.isolate',
+          ],
+        },
+      ],
+    }],
+  ],
+}

webrtc/webrtc.gyp

@@ -32,7 +32,6 @@
       'p2p/p2p.gyp:*',
       'system_wrappers/system_wrappers.gyp:*',
       'tools/tools.gyp:*',
-      'video_engine/video_engine.gyp:*',
       'voice_engine/voice_engine.gyp:*',
       '<(webrtc_vp8_dir)/vp8.gyp:*',
       '<(webrtc_vp9_dir)/vp9.gyp:*',
@@ -50,12 +49,13 @@
         ['include_tests==1', {
           'dependencies': [
             'common_video/common_video_unittests.gyp:*',
+            'rtc_unittests',
             'system_wrappers/system_wrappers_tests.gyp:*',
             'test/metrics.gyp:*',
             'test/test.gyp:*',
             'test/webrtc_test_common.gyp:webrtc_test_common_unittests',
+            'video_engine/video_engine_core_unittests.gyp:video_engine_core_unittests',
             'webrtc_tests',
-            'rtc_unittests',
           ],
         }],
       ],