diff options
| author | imcheng@chromium.org <imcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-07 11:26:28 +0000 |
|---|---|---|
| committer | imcheng@chromium.org <imcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-07 11:26:28 +0000 |
| commit | f44823ce60dc63a2835765f584ba76a484c89839 (patch) | |
| tree | 21bac700b6fae02fcdc93955606396755bc46295 /media/cast/cast.gyp | |
| parent | 1e68ed1cfcb9eba851d46c54a5b79da8186a89e9 (diff) | |
| download | chromium_src-f44823ce60dc63a2835765f584ba76a484c89839.zip chromium_src-f44823ce60dc63a2835765f584ba76a484c89839.tar.gz chromium_src-f44823ce60dc63a2835765f584ba76a484c89839.tar.bz2 | |
Cast: IPC from browser to renderer to send packet events from transport to cast library.
- Added a new IPC message: CastMsg_RawEvents
- Transmit cast logging settings to transport on browser side by adding a new field in CastTransportConfig.
- Install a LoggingImpl on transport side
-- If raw event logging is enabled, install a SimpleEventSubscriber to capture packet events.
-- If raw event logging is enabled, a RepeatingTimer will be started to call the subscriber to collect packet events and send back to cast library via the IPC.
NOTE: Currently, no actual packet events are logged on the transport. That will be in the next CL. There are two ways to do this:
- Pass LoggingImpl to sub components on the transport (paced_sender, rtp_packetizer, etc.)
- Pass a callback that will be propagated down and invoked at the right place.
BUG=343992
Review URL: https://codereview.chromium.org/178073004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255579 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/cast/cast.gyp')
| -rw-r--r-- | media/cast/cast.gyp | 73 |
1 files changed, 5 insertions, 68 deletions
diff --git a/media/cast/cast.gyp b/media/cast/cast.gyp index 33ac3f4..e0d0c69 100644 --- a/media/cast/cast.gyp +++ b/media/cast/cast.gyp @@ -23,70 +23,6 @@ 'cast_defines.h', 'cast_environment.cc', 'cast_environment.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/logging_stats.cc', - 'logging/logging_stats.h', - 'logging/raw_event_subscriber.h', - 'logging/simple_event_subscriber.cc', - 'logging/simple_event_subscriber.h', - ], # source - }, - { - 'target_name': 'cast_logging_proto_lib', - 'type': 'static_library', - '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': 'sender_logging', - 'type': 'static_library', - 'include_dirs': [ - '<(DEPTH)/', - ], - 'dependencies': [ - 'cast_config', - 'cast_logging_proto_lib', - '<(DEPTH)/base/base.gyp:base', - ], - 'export_dependent_settings': [ - 'cast_logging_proto_lib', - ], - 'sources': [ - 'logging/encoding_event_subscriber.cc', - 'logging/encoding_event_subscriber.h', - 'logging/log_serializer.cc', - 'logging/log_serializer.h', - ], # source - }, - { - 'target_name': 'cast_log_analysis', - 'type': 'static_library', - 'include_dirs': [ - '<(DEPTH)/', - ], - 'dependencies': [ - 'cast_config', - 'cast_logging_proto_lib', - '<(DEPTH)/base/base.gyp:base', - ], - 'export_dependent_settings': [ - 'cast_logging_proto_lib', - ], - 'sources': [ - 'logging/log_deserializer.cc', - 'logging/log_deserializer.h', ], # source }, ], # targets, @@ -98,11 +34,11 @@ 'type': '<(gtest_target_type)', 'dependencies': [ 'cast_config', - 'cast_log_analysis', - 'cast_logging_proto_lib', 'cast_receiver.gyp:cast_receiver', 'cast_sender.gyp:cast_sender', - 'sender_logging', + 'logging/logging.gyp:cast_log_analysis', + 'logging/logging.gyp:cast_logging_proto_lib', + 'logging/logging.gyp:sender_logging', 'test/utility/utility.gyp:cast_test_utility', 'transport/cast_transport.gyp:cast_transport', '<(DEPTH)/base/base.gyp:test_support_base', @@ -153,6 +89,7 @@ 'test/fake_single_thread_task_runner.h', 'test/fake_video_encode_accelerator.cc', 'test/fake_video_encode_accelerator.h', + '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', @@ -176,7 +113,7 @@ ], 'dependencies': [ 'cast_config', - 'sender_logging', + 'logging/logging.gyp:sender_logging', '<(DEPTH)/ui/gfx/gfx.gyp:gfx', '<(DEPTH)/net/net.gyp:net_test_support', '<(DEPTH)/media/cast/cast_sender.gyp:*', |