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/extensions/cast_streaming_native_handler.h" | 5 #include "chrome/renderer/extensions/cast_streaming_native_handler.h" |
6 | 6 |
7 #include <functional> | 7 #include <functional> |
8 #include <iterator> | 8 #include <iterator> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
73 cast_params->max_latency_ms = ext_params.max_latency; | 73 cast_params->max_latency_ms = ext_params.max_latency; |
74 cast_params->codec_name = ext_params.codec_name; | 74 cast_params->codec_name = ext_params.codec_name; |
75 cast_params->ssrc = ext_params.ssrc; | 75 cast_params->ssrc = ext_params.ssrc; |
76 cast_params->feedback_ssrc = ext_params.feedback_ssrc; | 76 cast_params->feedback_ssrc = ext_params.feedback_ssrc; |
77 cast_params->clock_rate = ext_params.clock_rate ? *ext_params.clock_rate : 0; | 77 cast_params->clock_rate = ext_params.clock_rate ? *ext_params.clock_rate : 0; |
78 cast_params->min_bitrate = | 78 cast_params->min_bitrate = |
79 ext_params.min_bitrate ? *ext_params.min_bitrate : 0; | 79 ext_params.min_bitrate ? *ext_params.min_bitrate : 0; |
80 cast_params->max_bitrate = | 80 cast_params->max_bitrate = |
81 ext_params.max_bitrate ? *ext_params.max_bitrate : 0; | 81 ext_params.max_bitrate ? *ext_params.max_bitrate : 0; |
82 cast_params->channels = ext_params.channels ? *ext_params.channels : 0; | 82 cast_params->channels = ext_params.channels ? *ext_params.channels : 0; |
| 83 cast_params->max_frame_rate = |
| 84 ext_params.max_frame_rate ? *ext_params.max_frame_rate : 0.0; |
83 cast_params->width = ext_params.width ? *ext_params.width : 0; | 85 cast_params->width = ext_params.width ? *ext_params.width : 0; |
84 cast_params->height = ext_params.height ? *ext_params.height : 0; | 86 cast_params->height = ext_params.height ? *ext_params.height : 0; |
85 if (ext_params.aes_key && | 87 if (ext_params.aes_key && |
86 !HexDecode(*ext_params.aes_key, &cast_params->aes_key)) { | 88 !HexDecode(*ext_params.aes_key, &cast_params->aes_key)) { |
87 isolate->ThrowException(v8::Exception::Error( | 89 isolate->ThrowException(v8::Exception::Error( |
88 v8::String::NewFromUtf8(isolate, kInvalidAesKey))); | 90 v8::String::NewFromUtf8(isolate, kInvalidAesKey))); |
89 return false; | 91 return false; |
90 } | 92 } |
91 if (ext_params.aes_iv_mask && | 93 if (ext_params.aes_iv_mask && |
92 !HexDecode(*ext_params.aes_iv_mask, &cast_params->aes_iv_mask)) { | 94 !HexDecode(*ext_params.aes_iv_mask, &cast_params->aes_iv_mask)) { |
(...skipping 18 matching lines...) Expand all Loading... |
111 ext_params->ssrc = cast_params.ssrc; | 113 ext_params->ssrc = cast_params.ssrc; |
112 ext_params->feedback_ssrc = cast_params.feedback_ssrc; | 114 ext_params->feedback_ssrc = cast_params.feedback_ssrc; |
113 if (cast_params.clock_rate) | 115 if (cast_params.clock_rate) |
114 ext_params->clock_rate.reset(new int(cast_params.clock_rate)); | 116 ext_params->clock_rate.reset(new int(cast_params.clock_rate)); |
115 if (cast_params.min_bitrate) | 117 if (cast_params.min_bitrate) |
116 ext_params->min_bitrate.reset(new int(cast_params.min_bitrate)); | 118 ext_params->min_bitrate.reset(new int(cast_params.min_bitrate)); |
117 if (cast_params.max_bitrate) | 119 if (cast_params.max_bitrate) |
118 ext_params->max_bitrate.reset(new int(cast_params.max_bitrate)); | 120 ext_params->max_bitrate.reset(new int(cast_params.max_bitrate)); |
119 if (cast_params.channels) | 121 if (cast_params.channels) |
120 ext_params->channels.reset(new int(cast_params.channels)); | 122 ext_params->channels.reset(new int(cast_params.channels)); |
| 123 if (cast_params.max_frame_rate > 0.0) |
| 124 ext_params->max_frame_rate.reset(new double(cast_params.max_frame_rate)); |
121 if (cast_params.width) | 125 if (cast_params.width) |
122 ext_params->width.reset(new int(cast_params.width)); | 126 ext_params->width.reset(new int(cast_params.width)); |
123 if (cast_params.height) | 127 if (cast_params.height) |
124 ext_params->height.reset(new int(cast_params.height)); | 128 ext_params->height.reset(new int(cast_params.height)); |
125 for (size_t i = 0; i < cast_params.codec_specific_params.size(); ++i) { | 129 for (size_t i = 0; i < cast_params.codec_specific_params.size(); ++i) { |
126 linked_ptr<CodecSpecificParams> ext_codec_params( | 130 linked_ptr<CodecSpecificParams> ext_codec_params( |
127 new CodecSpecificParams()); | 131 new CodecSpecificParams()); |
128 FromCastCodecSpecificParams(cast_params.codec_specific_params[i], | 132 FromCastCodecSpecificParams(cast_params.codec_specific_params[i], |
129 ext_codec_params.get()); | 133 ext_codec_params.get()); |
130 ext_params->codec_specific_params.push_back(ext_codec_params); | 134 ext_params->codec_specific_params.push_back(ext_codec_params); |
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
576 transport_id); | 580 transport_id); |
577 if (iter != udp_transport_map_.end()) | 581 if (iter != udp_transport_map_.end()) |
578 return iter->second.get(); | 582 return iter->second.get(); |
579 v8::Isolate* isolate = context()->v8_context()->GetIsolate(); | 583 v8::Isolate* isolate = context()->v8_context()->GetIsolate(); |
580 isolate->ThrowException(v8::Exception::RangeError( | 584 isolate->ThrowException(v8::Exception::RangeError( |
581 v8::String::NewFromUtf8(isolate, kUdpTransportNotFound))); | 585 v8::String::NewFromUtf8(isolate, kUdpTransportNotFound))); |
582 return NULL; | 586 return NULL; |
583 } | 587 } |
584 | 588 |
585 } // namespace extensions | 589 } // namespace extensions |
OLD | NEW |