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

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

Issue 2817553004: Add content type extension to capabilities (Closed)
Patch Set: Created 3 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
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | 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 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 webrtc::RtpExtension::kAbsSendTimeDefaultId)); 496 webrtc::RtpExtension::kAbsSendTimeDefaultId));
497 capabilities.header_extensions.push_back( 497 capabilities.header_extensions.push_back(
498 webrtc::RtpExtension(webrtc::RtpExtension::kVideoRotationUri, 498 webrtc::RtpExtension(webrtc::RtpExtension::kVideoRotationUri,
499 webrtc::RtpExtension::kVideoRotationDefaultId)); 499 webrtc::RtpExtension::kVideoRotationDefaultId));
500 capabilities.header_extensions.push_back(webrtc::RtpExtension( 500 capabilities.header_extensions.push_back(webrtc::RtpExtension(
501 webrtc::RtpExtension::kTransportSequenceNumberUri, 501 webrtc::RtpExtension::kTransportSequenceNumberUri,
502 webrtc::RtpExtension::kTransportSequenceNumberDefaultId)); 502 webrtc::RtpExtension::kTransportSequenceNumberDefaultId));
503 capabilities.header_extensions.push_back( 503 capabilities.header_extensions.push_back(
504 webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri, 504 webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri,
505 webrtc::RtpExtension::kPlayoutDelayDefaultId)); 505 webrtc::RtpExtension::kPlayoutDelayDefaultId));
506 capabilities.header_extensions.push_back(
brandtr 2017/04/12 16:22:10 Will this addition launch the header extension in
507 webrtc::RtpExtension(webrtc::RtpExtension::kVideoContentTypeUri,
508 webrtc::RtpExtension::kVideoContentTypeDefaultId));
506 return capabilities; 509 return capabilities;
507 } 510 }
508 511
509 void WebRtcVideoEngine2::SetExternalDecoderFactory( 512 void WebRtcVideoEngine2::SetExternalDecoderFactory(
510 WebRtcVideoDecoderFactory* decoder_factory) { 513 WebRtcVideoDecoderFactory* decoder_factory) {
511 RTC_DCHECK(!initialized_); 514 RTC_DCHECK(!initialized_);
512 external_decoder_factory_ = decoder_factory; 515 external_decoder_factory_ = decoder_factory;
513 } 516 }
514 517
515 void WebRtcVideoEngine2::SetExternalEncoderFactory( 518 void WebRtcVideoEngine2::SetExternalEncoderFactory(
(...skipping 2045 matching lines...) Expand 10 before | Expand all | Expand 10 after
2561 rtx_mapping[video_codecs[i].codec.id] != 2564 rtx_mapping[video_codecs[i].codec.id] !=
2562 ulpfec_config.red_payload_type) { 2565 ulpfec_config.red_payload_type) {
2563 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2566 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2564 } 2567 }
2565 } 2568 }
2566 2569
2567 return video_codecs; 2570 return video_codecs;
2568 } 2571 }
2569 2572
2570 } // namespace cricket 2573 } // namespace cricket
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698