Chromium Code Reviews| 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 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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)) { |
| 389 codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultH264PlType, | 389 VideoCodec codec = MakeVideoCodecWithDefaultFeedbackParams( |
| 390 kH264CodecName)); | 390 kDefaultH264PlType, kH264CodecName); |
| 391 // TODO(hta): Move all parameter generation for SDP into the codec | |
| 392 // implementation, for all codecs and parameters. | |
| 393 // TODO(hta): Move selection of profile-level-id to H.264 codec | |
| 394 // implementation. | |
| 395 // TODO(hta): Set FMTP parameters for all codecs of type H264. | |
| 396 codec.SetParam(kH264FmtpProfileLevelId, | |
| 397 kH264ProfileLevelConstrainedBaseline); | |
| 398 codec.SetParam(kH264FmtpLevelAsymmetryAllowed, "1"); | |
|
juberti2
2016/04/13 20:20:58
You can use the int version here, e.g. 1 instead o
hta-webrtc
2016/04/13 20:43:58
Acknowledged.
| |
| 399 codec.SetParam(kH264FmtpPacketizationMode, "1"); | |
| 400 codecs.push_back(codec); | |
| 391 codecs.push_back( | 401 codecs.push_back( |
| 392 VideoCodec::CreateRtxCodec(kDefaultRtxH264PlType, kDefaultH264PlType)); | 402 VideoCodec::CreateRtxCodec(kDefaultRtxH264PlType, kDefaultH264PlType)); |
| 393 } | 403 } |
| 394 codecs.push_back(VideoCodec(kDefaultRedPlType, kRedCodecName)); | 404 codecs.push_back(VideoCodec(kDefaultRedPlType, kRedCodecName)); |
| 395 codecs.push_back( | 405 codecs.push_back( |
| 396 VideoCodec::CreateRtxCodec(kDefaultRtxRedPlType, kDefaultRedPlType)); | 406 VideoCodec::CreateRtxCodec(kDefaultRtxRedPlType, kDefaultRedPlType)); |
| 397 codecs.push_back(VideoCodec(kDefaultUlpfecType, kUlpfecCodecName)); | 407 codecs.push_back(VideoCodec(kDefaultUlpfecType, kUlpfecCodecName)); |
| 398 return codecs; | 408 return codecs; |
| 399 } | 409 } |
| 400 | 410 |
| (...skipping 2166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2567 rtx_mapping[video_codecs[i].codec.id] != | 2577 rtx_mapping[video_codecs[i].codec.id] != |
| 2568 fec_settings.red_payload_type) { | 2578 fec_settings.red_payload_type) { |
| 2569 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; | 2579 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; |
| 2570 } | 2580 } |
| 2571 } | 2581 } |
| 2572 | 2582 |
| 2573 return video_codecs; | 2583 return video_codecs; |
| 2574 } | 2584 } |
| 2575 | 2585 |
| 2576 } // namespace cricket | 2586 } // namespace cricket |
| OLD | NEW |