Chromium Code Reviews| 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/location.h" | 10 #include "base/location.h" |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 82 } | 82 } |
| 83 } // namespace | 83 } // namespace |
| 84 | 84 |
| 85 bool ToCastRtpPayloadParamsOrThrow(v8::Isolate* isolate, | 85 bool ToCastRtpPayloadParamsOrThrow(v8::Isolate* isolate, |
| 86 const RtpPayloadParams& ext_params, | 86 const RtpPayloadParams& ext_params, |
| 87 CastRtpPayloadParams* cast_params) { | 87 CastRtpPayloadParams* cast_params) { |
| 88 cast_params->payload_type = ext_params.payload_type; | 88 cast_params->payload_type = ext_params.payload_type; |
| 89 cast_params->max_latency_ms = ext_params.max_latency; | 89 cast_params->max_latency_ms = ext_params.max_latency; |
| 90 cast_params->min_latency_ms = | 90 cast_params->min_latency_ms = |
| 91 ext_params.min_latency ? *ext_params.min_latency : ext_params.max_latency; | 91 ext_params.min_latency ? *ext_params.min_latency : ext_params.max_latency; |
| 92 cast_params->animated_latency_ms = ext_params.animated_latency | |
| 93 ? *ext_params.animated_latency | |
| 94 : ext_params.max_latency; | |
|
miu
2015/12/03 21:26:22
I think the "else" clause of this expression will
Irfan
2015/12/04 22:45:36
The else part of the expression is returning an in
miu
2015/12/08 00:16:16
Acknowledged.
| |
| 92 cast_params->codec_name = ext_params.codec_name; | 95 cast_params->codec_name = ext_params.codec_name; |
| 93 cast_params->ssrc = ext_params.ssrc; | 96 cast_params->ssrc = ext_params.ssrc; |
| 94 cast_params->feedback_ssrc = ext_params.feedback_ssrc; | 97 cast_params->feedback_ssrc = ext_params.feedback_ssrc; |
| 95 cast_params->clock_rate = ext_params.clock_rate ? *ext_params.clock_rate : 0; | 98 cast_params->clock_rate = ext_params.clock_rate ? *ext_params.clock_rate : 0; |
| 96 cast_params->min_bitrate = | 99 cast_params->min_bitrate = |
| 97 ext_params.min_bitrate ? *ext_params.min_bitrate : 0; | 100 ext_params.min_bitrate ? *ext_params.min_bitrate : 0; |
| 98 cast_params->max_bitrate = | 101 cast_params->max_bitrate = |
| 99 ext_params.max_bitrate ? *ext_params.max_bitrate : 0; | 102 ext_params.max_bitrate ? *ext_params.max_bitrate : 0; |
| 100 cast_params->channels = ext_params.channels ? *ext_params.channels : 0; | 103 cast_params->channels = ext_params.channels ? *ext_params.channels : 0; |
| 101 cast_params->max_frame_rate = | 104 cast_params->max_frame_rate = |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 119 cast_params->codec_specific_params.push_back(cast_codec_params); | 122 cast_params->codec_specific_params.push_back(cast_codec_params); |
| 120 } | 123 } |
| 121 return true; | 124 return true; |
| 122 } | 125 } |
| 123 | 126 |
| 124 void FromCastRtpPayloadParams(const CastRtpPayloadParams& cast_params, | 127 void FromCastRtpPayloadParams(const CastRtpPayloadParams& cast_params, |
| 125 RtpPayloadParams* ext_params) { | 128 RtpPayloadParams* ext_params) { |
| 126 ext_params->payload_type = cast_params.payload_type; | 129 ext_params->payload_type = cast_params.payload_type; |
| 127 ext_params->max_latency = cast_params.max_latency_ms; | 130 ext_params->max_latency = cast_params.max_latency_ms; |
| 128 ext_params->min_latency.reset(new int(cast_params.min_latency_ms)); | 131 ext_params->min_latency.reset(new int(cast_params.min_latency_ms)); |
| 132 ext_params->animated_latency.reset(new int(cast_params.animated_latency_ms)); | |
| 129 ext_params->codec_name = cast_params.codec_name; | 133 ext_params->codec_name = cast_params.codec_name; |
| 130 ext_params->ssrc = cast_params.ssrc; | 134 ext_params->ssrc = cast_params.ssrc; |
| 131 ext_params->feedback_ssrc = cast_params.feedback_ssrc; | 135 ext_params->feedback_ssrc = cast_params.feedback_ssrc; |
| 132 if (cast_params.clock_rate) | 136 if (cast_params.clock_rate) |
| 133 ext_params->clock_rate.reset(new int(cast_params.clock_rate)); | 137 ext_params->clock_rate.reset(new int(cast_params.clock_rate)); |
| 134 if (cast_params.min_bitrate) | 138 if (cast_params.min_bitrate) |
| 135 ext_params->min_bitrate.reset(new int(cast_params.min_bitrate)); | 139 ext_params->min_bitrate.reset(new int(cast_params.min_bitrate)); |
| 136 if (cast_params.max_bitrate) | 140 if (cast_params.max_bitrate) |
| 137 ext_params->max_bitrate.reset(new int(cast_params.max_bitrate)); | 141 ext_params->max_bitrate.reset(new int(cast_params.max_bitrate)); |
| 138 if (cast_params.channels) | 142 if (cast_params.channels) |
| (...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 850 void CastStreamingNativeHandler::AddTracksToMediaStream( | 854 void CastStreamingNativeHandler::AddTracksToMediaStream( |
| 851 const std::string& url, | 855 const std::string& url, |
| 852 const media::AudioParameters& params, | 856 const media::AudioParameters& params, |
| 853 scoped_refptr<media::AudioCapturerSource> audio, | 857 scoped_refptr<media::AudioCapturerSource> audio, |
| 854 scoped_ptr<media::VideoCapturerSource> video) { | 858 scoped_ptr<media::VideoCapturerSource> video) { |
| 855 content::AddAudioTrackToMediaStream(audio, params, true, true, url); | 859 content::AddAudioTrackToMediaStream(audio, params, true, true, url); |
| 856 content::AddVideoTrackToMediaStream(video.Pass(), true, true, url); | 860 content::AddVideoTrackToMediaStream(video.Pass(), true, true, url); |
| 857 } | 861 } |
| 858 | 862 |
| 859 } // namespace extensions | 863 } // namespace extensions |
| OLD | NEW |