Moved gypi to avoid presubmit warning about '..' when touching the files.
R=kjellander@webrtc.org,mflodman@webrtc.org
TBR=kjellander@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/39299004
Cr-Commit-Position: refs/heads/master@{#8503}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8503 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/video_coding/main/source/video_coding.gypi b/webrtc/modules/video_coding/main/source/video_coding.gypi
deleted file mode 100644
index 4793a13..0000000
--- a/webrtc/modules/video_coding/main/source/video_coding.gypi
+++ /dev/null
@@ -1,85 +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': 'webrtc_video_coding',
- 'type': 'static_library',
- 'dependencies': [
- 'webrtc_i420',
- '<(webrtc_root)/common_video/common_video.gyp:common_video',
- '<(webrtc_root)/modules/video_coding/utility/video_coding_utility.gyp:video_coding_utility',
- '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
- '<(webrtc_vp8_dir)/vp8.gyp:webrtc_vp8',
- '<(webrtc_vp9_dir)/vp9.gyp:webrtc_vp9',
- ],
- 'sources': [
- # interfaces
- '../interface/video_coding.h',
- '../interface/video_coding_defines.h',
-
- # headers
- 'codec_database.h',
- 'codec_timer.h',
- 'content_metrics_processing.h',
- 'decoding_state.h',
- 'encoded_frame.h',
- 'er_tables_xor.h',
- 'fec_tables_xor.h',
- 'frame_buffer.h',
- 'generic_decoder.h',
- 'generic_encoder.h',
- 'inter_frame_delay.h',
- 'internal_defines.h',
- 'jitter_buffer.h',
- 'jitter_buffer_common.h',
- 'jitter_estimator.h',
- 'media_opt_util.h',
- 'media_optimization.h',
- 'nack_fec_tables.h',
- 'packet.h',
- 'qm_select_data.h',
- 'qm_select.h',
- 'receiver.h',
- 'rtt_filter.h',
- 'session_info.h',
- 'timestamp_map.h',
- 'timing.h',
- 'video_coding_impl.h',
-
- # sources
- 'codec_database.cc',
- 'codec_timer.cc',
- 'content_metrics_processing.cc',
- 'decoding_state.cc',
- 'encoded_frame.cc',
- 'frame_buffer.cc',
- 'generic_decoder.cc',
- 'generic_encoder.cc',
- 'inter_frame_delay.cc',
- 'jitter_buffer.cc',
- 'jitter_estimator.cc',
- 'media_opt_util.cc',
- 'media_optimization.cc',
- 'packet.cc',
- 'qm_select.cc',
- 'receiver.cc',
- 'rtt_filter.cc',
- 'session_info.cc',
- 'timestamp_map.cc',
- 'timing.cc',
- 'video_coding_impl.cc',
- 'video_sender.cc',
- 'video_receiver.cc',
- ], # source
- # TODO(jschuh): Bug 1348: fix size_t to int truncations.
- 'msvs_disabled_warnings': [ 4267, ],
- },
- ],
-}
diff --git a/webrtc/modules/video_coding/main/source/video_coding_test.gypi b/webrtc/modules/video_coding/main/source/video_coding_test.gypi
deleted file mode 100644
index 81fd4e3..0000000
--- a/webrtc/modules/video_coding/main/source/video_coding_test.gypi
+++ /dev/null
@@ -1,61 +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.
-
-{
- 'targets': [
- {
- 'target_name': 'video_coding_test',
- 'type': 'executable',
- 'dependencies': [
- 'rtp_rtcp',
- 'video_processing',
- 'webrtc_video_coding',
- 'webrtc_utility',
- '<(DEPTH)/testing/gtest.gyp:gtest',
- '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
- '<(webrtc_root)/test/test.gyp:test_support',
- '<(webrtc_root)/test/metrics.gyp:metrics',
- '<(webrtc_root)/common_video/common_video.gyp:common_video',
- '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
- '<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common',
- ],
- 'sources': [
- # headers
- '../test/codec_database_test.h',
- '../test/generic_codec_test.h',
- '../test/media_opt_test.h',
- '../test/mt_test_common.h',
- '../test/normal_test.h',
- '../test/quality_modes_test.h',
- '../test/receiver_tests.h',
- '../test/release_test.h',
- '../test/rtp_player.h',
- '../test/test_callbacks.h',
- '../test/test_util.h',
- '../test/vcm_payload_sink_factory.h',
- '../test/video_source.h',
-
- # sources
- '../test/codec_database_test.cc',
- '../test/generic_codec_test.cc',
- '../test/media_opt_test.cc',
- '../test/mt_rx_tx_test.cc',
- '../test/mt_test_common.cc',
- '../test/normal_test.cc',
- '../test/quality_modes_test.cc',
- '../test/rtp_player.cc',
- '../test/test_callbacks.cc',
- '../test/test_util.cc',
- '../test/tester_main.cc',
- '../test/vcm_payload_sink_factory.cc',
- '../test/video_rtp_play.cc',
- '../test/video_rtp_play_mt.cc',
- '../test/video_source.cc',
- ], # sources
- },
- ],
-}
diff --git a/webrtc/modules/video_coding/video_coding.gypi b/webrtc/modules/video_coding/video_coding.gypi
new file mode 100644
index 0000000..484b82a
--- /dev/null
+++ b/webrtc/modules/video_coding/video_coding.gypi
@@ -0,0 +1,85 @@
+# 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': 'webrtc_video_coding',
+ 'type': 'static_library',
+ 'dependencies': [
+ 'webrtc_i420',
+ '<(webrtc_root)/common_video/common_video.gyp:common_video',
+ '<(webrtc_root)/modules/video_coding/utility/video_coding_utility.gyp:video_coding_utility',
+ '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers',
+ '<(webrtc_vp8_dir)/vp8.gyp:webrtc_vp8',
+ '<(webrtc_vp9_dir)/vp9.gyp:webrtc_vp9',
+ ],
+ 'sources': [
+ # interfaces
+ 'main/interface/video_coding.h',
+ 'main/interface/video_coding_defines.h',
+
+ # headers
+ 'main/source/codec_database.h',
+ 'main/source/codec_timer.h',
+ 'main/source/content_metrics_processing.h',
+ 'main/source/decoding_state.h',
+ 'main/source/encoded_frame.h',
+ 'main/source/er_tables_xor.h',
+ 'main/source/fec_tables_xor.h',
+ 'main/source/frame_buffer.h',
+ 'main/source/generic_decoder.h',
+ 'main/source/generic_encoder.h',
+ 'main/source/inter_frame_delay.h',
+ 'main/source/internal_defines.h',
+ 'main/source/jitter_buffer.h',
+ 'main/source/jitter_buffer_common.h',
+ 'main/source/jitter_estimator.h',
+ 'main/source/media_opt_util.h',
+ 'main/source/media_optimization.h',
+ 'main/source/nack_fec_tables.h',
+ 'main/source/packet.h',
+ 'main/source/qm_select_data.h',
+ 'main/source/qm_select.h',
+ 'main/source/receiver.h',
+ 'main/source/rtt_filter.h',
+ 'main/source/session_info.h',
+ 'main/source/timestamp_map.h',
+ 'main/source/timing.h',
+ 'main/source/video_coding_impl.h',
+
+ # sources
+ 'main/source/codec_database.cc',
+ 'main/source/codec_timer.cc',
+ 'main/source/content_metrics_processing.cc',
+ 'main/source/decoding_state.cc',
+ 'main/source/encoded_frame.cc',
+ 'main/source/frame_buffer.cc',
+ 'main/source/generic_decoder.cc',
+ 'main/source/generic_encoder.cc',
+ 'main/source/inter_frame_delay.cc',
+ 'main/source/jitter_buffer.cc',
+ 'main/source/jitter_estimator.cc',
+ 'main/source/media_opt_util.cc',
+ 'main/source/media_optimization.cc',
+ 'main/source/packet.cc',
+ 'main/source/qm_select.cc',
+ 'main/source/receiver.cc',
+ 'main/source/rtt_filter.cc',
+ 'main/source/session_info.cc',
+ 'main/source/timestamp_map.cc',
+ 'main/source/timing.cc',
+ 'main/source/video_coding_impl.cc',
+ 'main/source/video_sender.cc',
+ 'main/source/video_receiver.cc',
+ ], # source
+ # TODO(jschuh): Bug 1348: fix size_t to int truncations.
+ 'msvs_disabled_warnings': [ 4267, ],
+ },
+ ],
+}
diff --git a/webrtc/modules/video_coding/video_coding_test.gypi b/webrtc/modules/video_coding/video_coding_test.gypi
new file mode 100644
index 0000000..c990c3a
--- /dev/null
+++ b/webrtc/modules/video_coding/video_coding_test.gypi
@@ -0,0 +1,61 @@
+# 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.
+
+{
+ 'targets': [
+ {
+ 'target_name': 'video_coding_test',
+ 'type': 'executable',
+ 'dependencies': [
+ 'rtp_rtcp',
+ 'video_processing',
+ 'webrtc_video_coding',
+ 'webrtc_utility',
+ '<(DEPTH)/testing/gtest.gyp:gtest',
+ '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
+ '<(webrtc_root)/test/test.gyp:test_support',
+ '<(webrtc_root)/test/metrics.gyp:metrics',
+ '<(webrtc_root)/common_video/common_video.gyp:common_video',
+ '<(webrtc_root)/system_wrappers/system_wrappers.gyp:system_wrappers_default',
+ '<(webrtc_root)/test/webrtc_test_common.gyp:webrtc_test_common',
+ ],
+ 'sources': [
+ # headers
+ 'main/test/codec_database_test.h',
+ 'main/test/generic_codec_test.h',
+ 'main/test/media_opt_test.h',
+ 'main/test/mt_test_common.h',
+ 'main/test/normal_test.h',
+ 'main/test/quality_modes_test.h',
+ 'main/test/receiver_tests.h',
+ 'main/test/release_test.h',
+ 'main/test/rtp_player.h',
+ 'main/test/test_callbacks.h',
+ 'main/test/test_util.h',
+ 'main/test/vcm_payload_sink_factory.h',
+ 'main/test/video_source.h',
+
+ # sources
+ 'main/test/codec_database_test.cc',
+ 'main/test/generic_codec_test.cc',
+ 'main/test/media_opt_test.cc',
+ 'main/test/mt_rx_tx_test.cc',
+ 'main/test/mt_test_common.cc',
+ 'main/test/normal_test.cc',
+ 'main/test/quality_modes_test.cc',
+ 'main/test/rtp_player.cc',
+ 'main/test/test_callbacks.cc',
+ 'main/test/test_util.cc',
+ 'main/test/tester_main.cc',
+ 'main/test/vcm_payload_sink_factory.cc',
+ 'main/test/video_rtp_play.cc',
+ 'main/test/video_rtp_play_mt.cc',
+ 'main/test/video_source.cc',
+ ], # sources
+ },
+ ],
+}