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

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

Issue 2954503002: Implement FrameMarking header extension support
Patch Set: Implement Frame Marking header extension Created 3 years, 6 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
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 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 webrtc::RtpExtension::kTransportSequenceNumberUri, 516 webrtc::RtpExtension::kTransportSequenceNumberUri,
517 webrtc::RtpExtension::kTransportSequenceNumberDefaultId)); 517 webrtc::RtpExtension::kTransportSequenceNumberDefaultId));
518 capabilities.header_extensions.push_back( 518 capabilities.header_extensions.push_back(
519 webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri, 519 webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri,
520 webrtc::RtpExtension::kPlayoutDelayDefaultId)); 520 webrtc::RtpExtension::kPlayoutDelayDefaultId));
521 if (IsVideoContentTypeExtensionFieldTrialEnabled()) { 521 if (IsVideoContentTypeExtensionFieldTrialEnabled()) {
522 capabilities.header_extensions.push_back( 522 capabilities.header_extensions.push_back(
523 webrtc::RtpExtension(webrtc::RtpExtension::kVideoContentTypeUri, 523 webrtc::RtpExtension(webrtc::RtpExtension::kVideoContentTypeUri,
524 webrtc::RtpExtension::kVideoContentTypeDefaultId)); 524 webrtc::RtpExtension::kVideoContentTypeDefaultId));
525 } 525 }
526 capabilities.header_extensions.push_back(
527 webrtc::RtpExtension(webrtc::RtpExtension::kFrameMarkingUri,
528 webrtc::RtpExtension::kFrameMarkingDefaultId));
526 return capabilities; 529 return capabilities;
527 } 530 }
528 531
529 void WebRtcVideoEngine::SetExternalDecoderFactory( 532 void WebRtcVideoEngine::SetExternalDecoderFactory(
530 WebRtcVideoDecoderFactory* decoder_factory) { 533 WebRtcVideoDecoderFactory* decoder_factory) {
531 RTC_DCHECK(!initialized_); 534 RTC_DCHECK(!initialized_);
532 external_decoder_factory_ = decoder_factory; 535 external_decoder_factory_ = decoder_factory;
533 } 536 }
534 537
535 void WebRtcVideoEngine::SetExternalEncoderFactory( 538 void WebRtcVideoEngine::SetExternalEncoderFactory(
(...skipping 2133 matching lines...) Expand 10 before | Expand all | Expand 10 after
2669 rtx_mapping[video_codecs[i].codec.id] != 2672 rtx_mapping[video_codecs[i].codec.id] !=
2670 ulpfec_config.red_payload_type) { 2673 ulpfec_config.red_payload_type) {
2671 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2674 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2672 } 2675 }
2673 } 2676 }
2674 2677
2675 return video_codecs; 2678 return video_codecs;
2676 } 2679 }
2677 2680
2678 } // namespace cricket 2681 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698