OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 codec.codecType = kVideoCodecVP8; | 153 codec.codecType = kVideoCodecVP8; |
154 } else if (decoder.payload_name == "VP9") { | 154 } else if (decoder.payload_name == "VP9") { |
155 codec.codecType = kVideoCodecVP9; | 155 codec.codecType = kVideoCodecVP9; |
156 } else if (decoder.payload_name == "H264") { | 156 } else if (decoder.payload_name == "H264") { |
157 codec.codecType = kVideoCodecH264; | 157 codec.codecType = kVideoCodecH264; |
158 } else { | 158 } else { |
159 codec.codecType = kVideoCodecGeneric; | 159 codec.codecType = kVideoCodecGeneric; |
160 } | 160 } |
161 | 161 |
162 if (codec.codecType == kVideoCodecVP8) { | 162 if (codec.codecType == kVideoCodecVP8) { |
163 codec.codecSpecific.VP8 = VideoEncoder::GetDefaultVp8Settings(); | 163 *(codec.VP8()) = VideoEncoder::GetDefaultVp8Settings(); |
164 } else if (codec.codecType == kVideoCodecVP9) { | 164 } else if (codec.codecType == kVideoCodecVP9) { |
165 codec.codecSpecific.VP9 = VideoEncoder::GetDefaultVp9Settings(); | 165 *(codec.VP9()) = VideoEncoder::GetDefaultVp9Settings(); |
166 } else if (codec.codecType == kVideoCodecH264) { | 166 } else if (codec.codecType == kVideoCodecH264) { |
167 codec.codecSpecific.H264 = VideoEncoder::GetDefaultH264Settings(); | 167 *(codec.H264()) = VideoEncoder::GetDefaultH264Settings(); |
168 } | 168 } |
169 | 169 |
170 codec.width = 320; | 170 codec.width = 320; |
171 codec.height = 180; | 171 codec.height = 180; |
172 codec.startBitrate = codec.minBitrate = codec.maxBitrate = | 172 codec.startBitrate = codec.minBitrate = codec.maxBitrate = |
173 Call::Config::kDefaultStartBitrateBps / 1000; | 173 Call::Config::kDefaultStartBitrateBps / 1000; |
174 | 174 |
175 return codec; | 175 return codec; |
176 } | 176 } |
177 } // namespace | 177 } // namespace |
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
419 RequestKeyFrame(); | 419 RequestKeyFrame(); |
420 } | 420 } |
421 } | 421 } |
422 | 422 |
423 void VideoReceiveStream::RequestKeyFrame() { | 423 void VideoReceiveStream::RequestKeyFrame() { |
424 rtp_stream_receiver_.RequestKeyFrame(); | 424 rtp_stream_receiver_.RequestKeyFrame(); |
425 } | 425 } |
426 | 426 |
427 } // namespace internal | 427 } // namespace internal |
428 } // namespace webrtc | 428 } // namespace webrtc |
OLD | NEW |