Cast: Reshuffle files under media/cast

media/cast/cast.gyp

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'include_tests%': 1,
     'chromium_code': 1,
   },
   'conditions': [
     ['include_tests==1', {
       'includes': [ 'cast_testing.gypi' ]
     }],
   ],
   'targets': [
     {
       'target_name': 'cast_base',
       'type': 'static_library',
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'dependencies': [
         'cast_logging_proto',
         '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/crypto/crypto.gyp:crypto',
         '<(DEPTH)/net/net.gyp:net',
       ],
       'export_dependent_settings': [
         'cast_logging_proto',
       ],
       'sources': [
         'cast_config.cc',
         'cast_config.h',
         'cast_defines.h',
         'cast_environment.cc',
         'cast_environment.h',
-        'base/clock_drift_smoother.cc',
-        'base/clock_drift_smoother.h',
+        'common/clock_drift_smoother.cc',
+        'common/clock_drift_smoother.h',
+        'common/transport_encryption_handler.cc',
+        'common/transport_encryption_handler.h',
         'logging/encoding_event_subscriber.cc',
         'logging/encoding_event_subscriber.h',
         'logging/log_deserializer.cc',
         'logging/log_deserializer.h',
         'logging/log_serializer.cc',
         'logging/log_serializer.h',
         'logging/logging_defines.cc',
         'logging/logging_defines.h',
         'logging/logging_impl.cc',
         'logging/logging_impl.h',
         'logging/logging_raw.cc',
         'logging/logging_raw.h',
         'logging/raw_event_subscriber.h',
         'logging/raw_event_subscriber_bundle.cc',
         'logging/raw_event_subscriber_bundle.h',
         'logging/receiver_time_offset_estimator.h',
         'logging/receiver_time_offset_estimator_impl.cc',
         'logging/receiver_time_offset_estimator_impl.h',
         'logging/simple_event_subscriber.cc',
         'logging/simple_event_subscriber.h',
         'logging/stats_event_subscriber.cc',
         'logging/stats_event_subscriber.h',
-        'rtp_timestamp_helper.cc',
-        'rtp_timestamp_helper.h',
-        'transport/cast_transport_config.cc',
-        'transport/cast_transport_config.h',
-        'transport/cast_transport_defines.h',
-        'transport/cast_transport_sender.h',
       ], # source
     },
     {
       # GN version: //media/cast/logging/proto
       'target_name': 'cast_logging_proto',
       'type': 'static_library',
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'sources': [
         'logging/proto/proto_utils.cc',
         'logging/proto/raw_events.proto',
       ],
       'variables': {
         'proto_in_dir': 'logging/proto',
         'proto_out_dir': 'media/cast/logging/proto',
       },
       'includes': ['../../build/protoc.gypi'],
     },
     {
       'target_name': 'cast_receiver',
       'type': 'static_library',
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'dependencies': [
         'cast_base',
-        'cast_rtcp',
-        'cast_transport',
+        'cast_net',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/media/media.gyp:shared_memory_support',
         '<(DEPTH)/third_party/opus/opus.gyp:opus',
         '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
       ],
       'sources': [
         'cast_receiver.h',
-        'framer/cast_message_builder.cc',
-        'framer/cast_message_builder.h',
-        'framer/frame_buffer.cc',
-        'framer/frame_buffer.h',
-        'framer/frame_id_map.cc',
-        'framer/frame_id_map.h',
-        'framer/framer.cc',
-        'framer/framer.h',
         'receiver/audio_decoder.cc',
         'receiver/audio_decoder.h',
         'receiver/cast_receiver_impl.cc',
         'receiver/cast_receiver_impl.h',
         'receiver/frame_receiver.cc',
         'receiver/frame_receiver.h',
         'receiver/video_decoder.cc',
         'receiver/video_decoder.h',
-        'rtp_receiver/receiver_stats.cc',
-        'rtp_receiver/receiver_stats.h',
-        'rtp_receiver/rtp_receiver_defines.cc',
-        'rtp_receiver/rtp_receiver_defines.h',
-        'rtp_receiver/rtp_parser/rtp_parser.cc',
-        'rtp_receiver/rtp_parser/rtp_parser.h',
+        'net/rtp/cast_message_builder.cc',
+        'net/rtp/cast_message_builder.h',
+        'net/rtp/frame_buffer.cc',
+        'net/rtp/frame_buffer.h',
+        'net/rtp/frame_id_map.cc',
+        'net/rtp/frame_id_map.h',
+        'net/rtp/framer.cc',
+        'net/rtp/framer.h',
+        'net/rtp/receiver_stats.cc',
+        'net/rtp/receiver_stats.h',
+        'net/rtp/rtp_receiver_defines.cc',
+        'net/rtp/rtp_receiver_defines.h',
+        'net/rtp/rtp_parser.cc',
+        'net/rtp/rtp_parser.h',

[wtc, 2014/07/11 22:31:36]

Nit: list these two files before net/rtp/rtp_receiver_defines.cc.

[Alpha Left Google, 2014/07/12 01:37:55]

Done.

       ], # source
     },
     {
-      'target_name': 'cast_rtcp',
-      'type': 'static_library',
-      'include_dirs': [
-        '<(DEPTH)/',
-      ],
-      'dependencies': [
-        'cast_base',
-        'cast_transport',
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/net/net.gyp:net',
-      ],
-      'sources': [
-        'rtcp/rtcp_defines.cc',
-        'rtcp/rtcp_defines.h',
-        'rtcp/rtcp.h',
-        'rtcp/rtcp.cc',
-        'rtcp/rtcp_receiver.cc',
-        'rtcp/rtcp_receiver.h',
-        'rtcp/rtcp_sender.cc',
-        'rtcp/rtcp_sender.h',
-        'rtcp/rtcp_utility.cc',
-        'rtcp/rtcp_utility.h',
-        'rtcp/receiver_rtcp_event_subscriber.cc',
-        'rtcp/receiver_rtcp_event_subscriber.cc',
-      ], # source
-    },
-    {
       'target_name': 'cast_sender',
       'type': 'static_library',
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'dependencies': [
         'cast_base',
-        'cast_rtcp',
-        'cast_transport',
+        'cast_net',
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/media/media.gyp:shared_memory_support',
         '<(DEPTH)/third_party/opus/opus.gyp:opus',
         '<(DEPTH)/third_party/libvpx/libvpx.gyp:libvpx',
       ], # dependencies
       'sources': [
-        'audio_sender/audio_encoder.h',
-        'audio_sender/audio_encoder.cc',
-        'audio_sender/audio_sender.h',
-        'audio_sender/audio_sender.cc',
         'cast_sender.h',
         'cast_sender_impl.cc',
         'cast_sender_impl.h',
-        'congestion_control/congestion_control.h',
-        'congestion_control/congestion_control.cc',
-        'video_sender/codecs/vp8/vp8_encoder.cc',
-        'video_sender/codecs/vp8/vp8_encoder.h',
-        'video_sender/external_video_encoder.h',
-        'video_sender/external_video_encoder.cc',
-        'video_sender/fake_software_video_encoder.h',
-        'video_sender/fake_software_video_encoder.cc',
-        'video_sender/software_video_encoder.h',
-        'video_sender/video_encoder.h',
-        'video_sender/video_encoder_impl.h',
-        'video_sender/video_encoder_impl.cc',
-        'video_sender/video_sender.h',
-        'video_sender/video_sender.cc',
+        'sender/audio_encoder.h',
+        'sender/audio_encoder.cc',
+        'sender/audio_sender.h',
+        'sender/audio_sender.cc',
+        'sender/congestion_control.h',
+        'sender/congestion_control.cc',
+        'sender/external_video_encoder.h',
+        'sender/external_video_encoder.cc',
+        'sender/fake_software_video_encoder.h',
+        'sender/fake_software_video_encoder.cc',
+        'sender/rtp_timestamp_helper.cc',
+        'sender/rtp_timestamp_helper.h',
+        'sender/software_video_encoder.h',
+        'sender/video_encoder.h',
+        'sender/video_encoder_impl.h',
+        'sender/video_encoder_impl.cc',
+        'sender/video_sender.h',
+        'sender/video_sender.cc',
+        'sender/vp8_encoder.cc',
+        'sender/vp8_encoder.h',
       ], # source
     },
     {
-      'target_name': 'cast_transport',
+      'target_name': 'cast_net',
       'type': 'static_library',
       'include_dirs': [
         '<(DEPTH)/',
       ],
       'dependencies': [
         'cast_base',
         '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/crypto/crypto.gyp:crypto',
         '<(DEPTH)/net/net.gyp:net',
       ],
       'sources': [
-        'transport/cast_transport_sender_impl.cc',
-        'transport/cast_transport_sender_impl.h',
-        'transport/pacing/paced_sender.cc',
-        'transport/pacing/paced_sender.h',
-        'transport/rtcp/rtcp_builder.cc',
-        'transport/rtcp/rtcp_builder.h',
-        'transport/rtp_sender/packet_storage/packet_storage.cc',
-        'transport/rtp_sender/packet_storage/packet_storage.h',
-        'transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc',
-        'transport/rtp_sender/rtp_packetizer/rtp_packetizer.h',
-        'transport/rtp_sender/rtp_sender.cc',
-        'transport/rtp_sender/rtp_sender.h',
-        'transport/transport/udp_transport.cc',
-        'transport/transport/udp_transport.h',
-        'transport/utility/transport_encryption_handler.cc',
-        'transport/utility/transport_encryption_handler.h',
+        'net/cast_transport_config.cc',
+        'net/cast_transport_config.h',
+        'net/cast_transport_defines.h',
+        'net/cast_transport_sender.h',
+        'net/cast_transport_sender_impl.cc',
+        'net/cast_transport_sender_impl.h',
+        'net/pacing/paced_sender.cc',
+        'net/pacing/paced_sender.h',
+        'net/rtcp/rtcp_builder.cc',
+        'net/rtcp/rtcp_builder.h',
+        'net/rtcp/rtcp_defines.cc',
+        'net/rtcp/rtcp_defines.h',
+        'net/rtcp/rtcp.h',
+        'net/rtcp/rtcp.cc',
+        'net/rtcp/rtcp_receiver.cc',
+        'net/rtcp/rtcp_receiver.h',
+        'net/rtcp/rtcp_sender.cc',
+        'net/rtcp/rtcp_sender.h',
+        'net/rtcp/rtcp_utility.cc',
+        'net/rtcp/rtcp_utility.h',
+        'net/rtcp/receiver_rtcp_event_subscriber.cc',
+        'net/rtcp/receiver_rtcp_event_subscriber.cc',

[wtc, 2014/07/11 22:31:36]

Delete a duplicate, and move the other one before net/rtcp/rtcp_builder.cc.

[Alpha Left Google, 2014/07/12 01:37:55]

Done.

+        'net/rtp/packet_storage.cc',
+        'net/rtp/packet_storage.h',
+        'net/rtp/rtp_packetizer.cc',
+        'net/rtp/rtp_packetizer.h',
+        'net/rtp/rtp_sender.cc',
+        'net/rtp/rtp_sender.h',
+        'net/udp_transport.cc',
+        'net/udp_transport.h',
       ], # source
     },
   ],
 }