media/cast/cast.gyp - Issue 388663003: Cast: Reshuffle files under media/cast

Unified Diff: media/cast/cast.gyp

Issue 388663003: Cast: Reshuffle files under media/cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: similarity = 10 Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: media/cast/cast.gyp

diff --git a/media/cast/cast.gyp b/media/cast/cast.gyp

index ac593c8e470a5ef65433fc559e1c1152554e9068..46c62b620ea135900e35222eb4646a1062670421 100644

--- a/media/cast/cast.gyp

+++ b/media/cast/cast.gyp

@@ -22,6 +22,7 @@

'dependencies': [

'cast_logging_proto',

'<(DEPTH)/base/base.gyp:base',

+ '<(DEPTH)/crypto/crypto.gyp:crypto',

'<(DEPTH)/net/net.gyp:net',

'export_dependent_settings': [

@@ -33,8 +34,10 @@

'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',

@@ -57,12 +60,6 @@

'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

{

@@ -90,8 +87,7 @@

'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',

@@ -101,14 +97,6 @@

'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',

@@ -117,39 +105,20 @@

'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',

- ], # 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',

+ '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_recei

Alpha Left Google 2014/07/12 01:37:55 Done.

], # source

{

@@ -160,39 +129,40 @@

'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)/',

@@ -200,26 +170,39 @@

'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',

wtc 2014/07/11 22:31:36 Delete a duplicate, and move the other one before

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

« chrome/common/cast_messages.h ('K') | « media/cast/base/clock_drift_smoother.cc ('k') | media/cast/cast_config.h » ('j') | media/cast/cast_testing.gypi » ('J')