diff options
author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-15 01:04:25 +0000 |
---|---|---|
committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-15 01:04:25 +0000 |
commit | 734732edf6e4c41ea4502304dcc5e85e248aada6 (patch) | |
tree | 856a96eee67187b028d0bfae54884b97e9292945 /media/cast/cast_testing.gypi | |
parent | 20ccd13869224f5c78e18f143ddf2a86c1740aa3 (diff) | |
download | chromium_src-734732edf6e4c41ea4502304dcc5e85e248aada6.zip chromium_src-734732edf6e4c41ea4502304dcc5e85e248aada6.tar.gz chromium_src-734732edf6e4c41ea4502304dcc5e85e248aada6.tar.bz2 |
Cast: Reshuffle files under media/cast
This is a large refactoring to move files around where it makes sense.
media/cast/transport/rtp_sender => media/cast/net/rtp
media/cast/transport/rtp_sender/packet_storage => media/cast/net/rtp
media/cast/transport/rtp_sender/packetizer => media/cast/net/rtp
media/cast/transport/transport => media/cast/net
media/cast/base => media/cast/common
media/cast/transport/utility => media/cast/common
media/cast/video_sender => media/cast/sender
media/cast/video_sender/codecs/vp8 => media/cast/sender
media/cast/audio_sender => media/cast/sender
media/cast/congestion_control => media/cast/sender
media/cast/transport => media/cast/net
media/cast/framer => media/cast/net/rtp
media/cast/rtp_receiver => media/cast/net/rtp
media/cast/rtcp => media/cast/net/rtcp
Remove "transport" namespace
BUG=393042
Review URL: https://codereview.chromium.org/388663003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cast/cast_testing.gypi')
-rw-r--r-- | media/cast/cast_testing.gypi | 86 |
1 files changed, 42 insertions, 44 deletions
diff --git a/media/cast/cast_testing.gypi b/media/cast/cast_testing.gypi index e6c7c56..97e831e 100644 --- a/media/cast/cast_testing.gypi +++ b/media/cast/cast_testing.gypi @@ -11,8 +11,8 @@ '<(DEPTH)/', ], 'dependencies': [ + 'cast_net', 'cast_receiver', - 'cast_transport', '<(DEPTH)/testing/gtest.gyp:gtest', '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg', '<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv', @@ -58,14 +58,13 @@ ], 'dependencies': [ 'cast_base', + 'cast_net', 'cast_receiver', - 'cast_rtcp', 'cast_sender', 'cast_test_utility', # Not a true dependency. This is here to make sure the CQ can verify # the tools compile correctly. 'cast_tools', - 'cast_transport', '<(DEPTH)/base/base.gyp:test_support_base', '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/testing/gmock.gyp:gmock', @@ -73,12 +72,6 @@ ], 'sources': [ '<(DEPTH)/media/base/run_all_unittests.cc', - 'audio_sender/audio_encoder_unittest.cc', - 'audio_sender/audio_sender_unittest.cc', - 'congestion_control/congestion_control_unittest.cc', - 'framer/cast_message_builder_unittest.cc', - 'framer/frame_buffer_unittest.cc', - 'framer/framer_unittest.cc', 'logging/encoding_event_subscriber_unittest.cc', 'logging/serialize_deserialize_test.cc', 'logging/logging_impl_unittest.cc', @@ -86,26 +79,44 @@ 'logging/receiver_time_offset_estimator_impl_unittest.cc', 'logging/simple_event_subscriber_unittest.cc', 'logging/stats_event_subscriber_unittest.cc', + 'net/cast_transport_sender_impl_unittest.cc', + 'net/pacing/mock_paced_packet_sender.cc', + 'net/pacing/mock_paced_packet_sender.h', + 'net/pacing/paced_sender_unittest.cc', + 'net/rtcp/mock_rtcp_receiver_feedback.cc', + 'net/rtcp/mock_rtcp_receiver_feedback.h', + 'net/rtcp/mock_rtcp_sender_feedback.cc', + 'net/rtcp/mock_rtcp_sender_feedback.h', + 'net/rtcp/rtcp_receiver_unittest.cc', + 'net/rtcp/rtcp_sender_unittest.cc', + 'net/rtcp/rtcp_unittest.cc', + 'net/rtcp/receiver_rtcp_event_subscriber_unittest.cc', +# TODO(miu): The following two are test utility modules. Rename/move the files. + 'net/rtcp/test_rtcp_packet_builder.cc', + 'net/rtcp/test_rtcp_packet_builder.h', + 'net/rtp/cast_message_builder_unittest.cc', + 'net/rtp/frame_buffer_unittest.cc', + 'net/rtp/framer_unittest.cc', + 'net/rtp/mock_rtp_payload_feedback.cc', + 'net/rtp/mock_rtp_payload_feedback.h', + 'net/rtp/packet_storage_unittest.cc', + 'net/rtp/receiver_stats_unittest.cc', + 'net/rtp/rtp_header_parser.cc', + 'net/rtp/rtp_header_parser.h', + 'net/rtp/rtp_packet_builder.cc', + 'net/rtp/rtp_parser_unittest.cc', + 'net/rtp/rtp_packetizer_unittest.cc', + 'net/rtp/rtp_receiver_defines.h', + 'net/udp_transport_unittest.cc', 'receiver/audio_decoder_unittest.cc', 'receiver/frame_receiver_unittest.cc', 'receiver/video_decoder_unittest.cc', - 'rtcp/mock_rtcp_receiver_feedback.cc', - 'rtcp/mock_rtcp_receiver_feedback.h', - 'rtcp/mock_rtcp_sender_feedback.cc', - 'rtcp/mock_rtcp_sender_feedback.h', - 'rtcp/rtcp_receiver_unittest.cc', - 'rtcp/rtcp_sender_unittest.cc', - 'rtcp/rtcp_unittest.cc', - 'rtcp/receiver_rtcp_event_subscriber_unittest.cc', -# TODO(miu): The following two are test utility modules. Rename/move the files. - 'rtcp/test_rtcp_packet_builder.cc', - 'rtcp/test_rtcp_packet_builder.h', - 'rtp_receiver/rtp_receiver_defines.h', - 'rtp_receiver/mock_rtp_payload_feedback.cc', - 'rtp_receiver/mock_rtp_payload_feedback.h', - 'rtp_receiver/receiver_stats_unittest.cc', - 'rtp_receiver/rtp_parser/test/rtp_packet_builder.cc', - 'rtp_receiver/rtp_parser/rtp_parser_unittest.cc', + 'sender/audio_encoder_unittest.cc', + 'sender/audio_sender_unittest.cc', + 'sender/congestion_control_unittest.cc', + 'sender/external_video_encoder_unittest.cc', + 'sender/video_encoder_impl_unittest.cc', + 'sender/video_sender_unittest.cc', 'test/end2end_unittest.cc', 'test/fake_receiver_time_offset_estimator.cc', 'test/fake_receiver_time_offset_estimator.h', @@ -115,18 +126,6 @@ 'test/fake_video_encode_accelerator.h', 'test/utility/audio_utility_unittest.cc', 'test/utility/barcode_unittest.cc', - 'transport/cast_transport_sender_impl_unittest.cc', - 'transport/pacing/mock_paced_packet_sender.cc', - 'transport/pacing/mock_paced_packet_sender.h', - 'transport/pacing/paced_sender_unittest.cc', - 'transport/rtp_sender/packet_storage/packet_storage_unittest.cc', - 'transport/rtp_sender/rtp_packetizer/rtp_packetizer_unittest.cc', - 'transport/rtp_sender/rtp_packetizer/test/rtp_header_parser.cc', - 'transport/rtp_sender/rtp_packetizer/test/rtp_header_parser.h', - 'transport/transport/udp_transport_unittest.cc', - 'video_sender/external_video_encoder_unittest.cc', - 'video_sender/video_encoder_impl_unittest.cc', - 'video_sender/video_sender_unittest.cc', ], # source }, { @@ -137,11 +136,10 @@ ], 'dependencies': [ 'cast_base', + 'cast_net', 'cast_receiver', - 'cast_rtcp', 'cast_sender', 'cast_test_utility', - 'cast_transport', '<(DEPTH)/base/base.gyp:test_support_base', '<(DEPTH)/net/net.gyp:net', '<(DEPTH)/testing/gtest.gyp:gtest', @@ -185,9 +183,9 @@ ], 'dependencies': [ 'cast_base', + 'cast_net', 'cast_receiver', 'cast_test_utility', - 'cast_transport', '<(DEPTH)/net/net.gyp:net_test_support', '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/testing/gtest.gyp:gtest', @@ -218,9 +216,9 @@ ], 'dependencies': [ 'cast_base', + 'cast_net', 'cast_sender', 'cast_test_utility', - 'cast_transport', '<(DEPTH)/net/net.gyp:net_test_support', '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/testing/gtest.gyp:gtest', @@ -240,10 +238,10 @@ ], 'dependencies': [ 'cast_base', + 'cast_net', 'cast_network_model_proto', 'cast_sender', 'cast_test_utility', - 'cast_transport', '<(DEPTH)/net/net.gyp:net_test_support', '<(DEPTH)/media/media.gyp:media', '<(DEPTH)/testing/gtest.gyp:gtest', @@ -294,8 +292,8 @@ ], 'dependencies': [ 'cast_base', + 'cast_net', 'cast_test_utility', - 'cast_transport', '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/media/media.gyp:media', ], |