OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2014 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 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
378 codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp8PlType, | 378 codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp8PlType, |
379 kVp8CodecName)); | 379 kVp8CodecName)); |
380 codecs.push_back( | 380 codecs.push_back( |
381 VideoCodec::CreateRtxCodec(kDefaultRtxVp8PlType, kDefaultVp8PlType)); | 381 VideoCodec::CreateRtxCodec(kDefaultRtxVp8PlType, kDefaultVp8PlType)); |
382 if (CodecIsInternallySupported(kVp9CodecName)) { | 382 if (CodecIsInternallySupported(kVp9CodecName)) { |
383 codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp9PlType, | 383 codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp9PlType, |
384 kVp9CodecName)); | 384 kVp9CodecName)); |
385 codecs.push_back( | 385 codecs.push_back( |
386 VideoCodec::CreateRtxCodec(kDefaultRtxVp9PlType, kDefaultVp9PlType)); | 386 VideoCodec::CreateRtxCodec(kDefaultRtxVp9PlType, kDefaultVp9PlType)); |
387 } | 387 } |
388 if (CodecIsInternallySupported(kH264CodecName)) { | 388 if (CodecIsInternallySupported(kH264CodecName)) { |
hbos
2016/04/12 11:41:14
Hmm, I guess this was always the case, but this co
hta-webrtc
2016/04/12 12:48:44
Yes, that makes the third TODO here: Move SDP para
| |
389 codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultH264PlType, | 389 VideoCodec codec = MakeVideoCodecWithDefaultFeedbackParams( |
390 kH264CodecName)); | 390 kDefaultH264PlType, kH264CodecName); |
391 // TODO(hta): Move selection of profile-level-id to codec implementation. | |
392 // TODO(hta): Set FMTP parameters for all codecs of type H264. | |
393 codec.SetParam(kH264FmtpProfileLevelId, | |
394 kH264ProfileLevelConstrainedBaseline); | |
395 codec.SetParam(kH264FmtpLevelAsymmetryAllowed, "1"); | |
396 codec.SetParam(kH264FmtpPacketizationMode, "1"); | |
397 codecs.push_back(codec); | |
391 codecs.push_back( | 398 codecs.push_back( |
392 VideoCodec::CreateRtxCodec(kDefaultRtxH264PlType, kDefaultH264PlType)); | 399 VideoCodec::CreateRtxCodec(kDefaultRtxH264PlType, kDefaultH264PlType)); |
393 } | 400 } |
394 codecs.push_back(VideoCodec(kDefaultRedPlType, kRedCodecName)); | 401 codecs.push_back(VideoCodec(kDefaultRedPlType, kRedCodecName)); |
395 codecs.push_back( | 402 codecs.push_back( |
396 VideoCodec::CreateRtxCodec(kDefaultRtxRedPlType, kDefaultRedPlType)); | 403 VideoCodec::CreateRtxCodec(kDefaultRtxRedPlType, kDefaultRedPlType)); |
397 codecs.push_back(VideoCodec(kDefaultUlpfecType, kUlpfecCodecName)); | 404 codecs.push_back(VideoCodec(kDefaultUlpfecType, kUlpfecCodecName)); |
398 return codecs; | 405 return codecs; |
399 } | 406 } |
400 | 407 |
(...skipping 2166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2567 rtx_mapping[video_codecs[i].codec.id] != | 2574 rtx_mapping[video_codecs[i].codec.id] != |
2568 fec_settings.red_payload_type) { | 2575 fec_settings.red_payload_type) { |
2569 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2576 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
2570 } | 2577 } |
2571 } | 2578 } |
2572 | 2579 |
2573 return video_codecs; | 2580 return video_codecs; |
2574 } | 2581 } |
2575 | 2582 |
2576 } // namespace cricket | 2583 } // namespace cricket |
OLD | NEW |