OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/renderer/media/cast_session_delegate.h" | 5 #include "chrome/renderer/media/cast_session_delegate.h" |
6 | 6 |
7 #include "base/callback_helpers.h" | 7 #include "base/callback_helpers.h" |
8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
11 #include "base/strings/stringprintf.h" | 11 #include "base/strings/stringprintf.h" |
12 #include "base/thread_task_runner_handle.h" | 12 #include "base/thread_task_runner_handle.h" |
13 #include "chrome/common/chrome_version_info.h" | |
14 #include "chrome/renderer/media/cast_threads.h" | 13 #include "chrome/renderer/media/cast_threads.h" |
15 #include "chrome/renderer/media/cast_transport_sender_ipc.h" | 14 #include "chrome/renderer/media/cast_transport_sender_ipc.h" |
| 15 #include "components/version_info/version_info.h" |
16 #include "content/public/renderer/render_thread.h" | 16 #include "content/public/renderer/render_thread.h" |
17 #include "media/cast/cast_config.h" | 17 #include "media/cast/cast_config.h" |
18 #include "media/cast/cast_environment.h" | 18 #include "media/cast/cast_environment.h" |
19 #include "media/cast/cast_sender.h" | 19 #include "media/cast/cast_sender.h" |
20 #include "media/cast/logging/log_serializer.h" | 20 #include "media/cast/logging/log_serializer.h" |
21 #include "media/cast/logging/logging_defines.h" | 21 #include "media/cast/logging/logging_defines.h" |
22 #include "media/cast/logging/proto/raw_events.pb.h" | 22 #include "media/cast/logging/proto/raw_events.pb.h" |
23 #include "media/cast/logging/raw_event_subscriber_bundle.h" | 23 #include "media/cast/logging/raw_event_subscriber_bundle.h" |
24 #include "media/cast/net/cast_transport_config.h" | 24 #include "media/cast/net/cast_transport_config.h" |
25 #include "media/cast/net/cast_transport_sender.h" | 25 #include "media/cast/net/cast_transport_sender.h" |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 media::cast::proto::LogMetadata metadata; | 204 media::cast::proto::LogMetadata metadata; |
205 media::cast::FrameEventList frame_events; | 205 media::cast::FrameEventList frame_events; |
206 media::cast::PacketEventList packet_events; | 206 media::cast::PacketEventList packet_events; |
207 | 207 |
208 subscriber->GetEventsAndReset(&metadata, &frame_events, &packet_events); | 208 subscriber->GetEventsAndReset(&metadata, &frame_events, &packet_events); |
209 | 209 |
210 if (!extra_data.empty()) | 210 if (!extra_data.empty()) |
211 metadata.set_extra_data(extra_data); | 211 metadata.set_extra_data(extra_data); |
212 media::cast::proto::GeneralDescription* gen_desc = | 212 media::cast::proto::GeneralDescription* gen_desc = |
213 metadata.mutable_general_description(); | 213 metadata.mutable_general_description(); |
214 chrome::VersionInfo version_info; | 214 gen_desc->set_product(version_info::GetProductName()); |
215 gen_desc->set_product(version_info.Name()); | 215 gen_desc->set_product_version(version_info::GetVersionNumber()); |
216 gen_desc->set_product_version(version_info.Version()); | 216 gen_desc->set_os(version_info::GetOSType()); |
217 gen_desc->set_os(version_info.OSType()); | |
218 | 217 |
219 scoped_ptr<char[]> serialized_log(new char[media::cast::kMaxSerializedBytes]); | 218 scoped_ptr<char[]> serialized_log(new char[media::cast::kMaxSerializedBytes]); |
220 int output_bytes; | 219 int output_bytes; |
221 bool success = media::cast::SerializeEvents(metadata, | 220 bool success = media::cast::SerializeEvents(metadata, |
222 frame_events, | 221 frame_events, |
223 packet_events, | 222 packet_events, |
224 true, | 223 true, |
225 media::cast::kMaxSerializedBytes, | 224 media::cast::kMaxSerializedBytes, |
226 serialized_log.get(), | 225 serialized_log.get(), |
227 &output_bytes); | 226 &output_bytes); |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 } else { | 347 } else { |
349 cast_environment_->Logging()->InsertFrameEvent( | 348 cast_environment_->Logging()->InsertFrameEvent( |
350 it->timestamp, | 349 it->timestamp, |
351 it->type, | 350 it->type, |
352 it->media_type, | 351 it->media_type, |
353 it->rtp_timestamp, | 352 it->rtp_timestamp, |
354 it->frame_id); | 353 it->frame_id); |
355 } | 354 } |
356 } | 355 } |
357 } | 356 } |
OLD | NEW |