Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

Side by Side Diff: webrtc/media/engine/webrtcvideoengine2.cc

Issue 1898063002: FMTP parameters for the H.264 codec (merged) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@51
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« webrtc/api/webrtcsdp.cc ('K') | « webrtc/media/base/mediaconstants.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 kVp8CodecName)); 380 kVp8CodecName));
381 codecs.push_back( 381 codecs.push_back(
382 VideoCodec::CreateRtxCodec(kDefaultRtxVp8PlType, kDefaultVp8PlType)); 382 VideoCodec::CreateRtxCodec(kDefaultRtxVp8PlType, kDefaultVp8PlType));
383 if (CodecIsInternallySupported(kVp9CodecName)) { 383 if (CodecIsInternallySupported(kVp9CodecName)) {
384 codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp9PlType, 384 codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultVp9PlType,
385 kVp9CodecName)); 385 kVp9CodecName));
386 codecs.push_back( 386 codecs.push_back(
387 VideoCodec::CreateRtxCodec(kDefaultRtxVp9PlType, kDefaultVp9PlType)); 387 VideoCodec::CreateRtxCodec(kDefaultRtxVp9PlType, kDefaultVp9PlType));
388 } 388 }
389 if (CodecIsInternallySupported(kH264CodecName)) { 389 if (CodecIsInternallySupported(kH264CodecName)) {
390 codecs.push_back(MakeVideoCodecWithDefaultFeedbackParams(kDefaultH264PlType, 390 VideoCodec codec = MakeVideoCodecWithDefaultFeedbackParams(
391 kH264CodecName)); 391 kDefaultH264PlType, kH264CodecName);
392 // TODO(hta): Move all parameter generation for SDP into the codec
393 // implementation, for all codecs and parameters.
394 // TODO(hta): Move selection of profile-level-id to H.264 codec
395 // implementation.
396 // TODO(hta): Set FMTP parameters for all codecs of type H264.
397 codec.SetParam(kH264FmtpProfileLevelId,
398 kH264ProfileLevelConstrainedBaseline);
399 codec.SetParam(kH264FmtpLevelAsymmetryAllowed, "1");
400 codec.SetParam(kH264FmtpPacketizationMode, "1");
401 codecs.push_back(codec);
392 codecs.push_back( 402 codecs.push_back(
393 VideoCodec::CreateRtxCodec(kDefaultRtxH264PlType, kDefaultH264PlType)); 403 VideoCodec::CreateRtxCodec(kDefaultRtxH264PlType, kDefaultH264PlType));
394 } 404 }
395 codecs.push_back(VideoCodec(kDefaultRedPlType, kRedCodecName)); 405 codecs.push_back(VideoCodec(kDefaultRedPlType, kRedCodecName));
396 codecs.push_back( 406 codecs.push_back(
397 VideoCodec::CreateRtxCodec(kDefaultRtxRedPlType, kDefaultRedPlType)); 407 VideoCodec::CreateRtxCodec(kDefaultRtxRedPlType, kDefaultRedPlType));
398 codecs.push_back(VideoCodec(kDefaultUlpfecType, kUlpfecCodecName)); 408 codecs.push_back(VideoCodec(kDefaultUlpfecType, kUlpfecCodecName));
399 return codecs; 409 return codecs;
400 } 410 }
401 411
(...skipping 2198 matching lines...) Expand 10 before | Expand all | Expand 10 after
2600 rtx_mapping[video_codecs[i].codec.id] != 2610 rtx_mapping[video_codecs[i].codec.id] !=
2601 fec_settings.red_payload_type) { 2611 fec_settings.red_payload_type) {
2602 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2612 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2603 } 2613 }
2604 } 2614 }
2605 2615
2606 return video_codecs; 2616 return video_codecs;
2607 } 2617 }
2608 2618
2609 } // namespace cricket 2619 } // namespace cricket
OLDNEW
« webrtc/api/webrtcsdp.cc ('K') | « webrtc/media/base/mediaconstants.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698