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

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

Issue 2911193002: Implement timing frames. (Closed)
Patch Set: Fix uninitialized variables memcheck errors 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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
515 webrtc::RtpExtension::kTransportSequenceNumberUri, 515 webrtc::RtpExtension::kTransportSequenceNumberUri,
516 webrtc::RtpExtension::kTransportSequenceNumberDefaultId)); 516 webrtc::RtpExtension::kTransportSequenceNumberDefaultId));
517 capabilities.header_extensions.push_back( 517 capabilities.header_extensions.push_back(
518 webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri, 518 webrtc::RtpExtension(webrtc::RtpExtension::kPlayoutDelayUri,
519 webrtc::RtpExtension::kPlayoutDelayDefaultId)); 519 webrtc::RtpExtension::kPlayoutDelayDefaultId));
520 if (IsVideoContentTypeExtensionFieldTrialEnabled()) { 520 if (IsVideoContentTypeExtensionFieldTrialEnabled()) {
521 capabilities.header_extensions.push_back( 521 capabilities.header_extensions.push_back(
522 webrtc::RtpExtension(webrtc::RtpExtension::kVideoContentTypeUri, 522 webrtc::RtpExtension(webrtc::RtpExtension::kVideoContentTypeUri,
523 webrtc::RtpExtension::kVideoContentTypeDefaultId)); 523 webrtc::RtpExtension::kVideoContentTypeDefaultId));
524 } 524 }
525 // TODO(ilnik): Add kVideoTimingUri/kVideoTimingDefaultId to capabilities.
526 // Possibly inside field trial.
525 return capabilities; 527 return capabilities;
526 } 528 }
527 529
528 void WebRtcVideoEngine2::SetExternalDecoderFactory( 530 void WebRtcVideoEngine2::SetExternalDecoderFactory(
529 WebRtcVideoDecoderFactory* decoder_factory) { 531 WebRtcVideoDecoderFactory* decoder_factory) {
530 RTC_DCHECK(!initialized_); 532 RTC_DCHECK(!initialized_);
531 external_decoder_factory_ = decoder_factory; 533 external_decoder_factory_ = decoder_factory;
532 } 534 }
533 535
534 void WebRtcVideoEngine2::SetExternalEncoderFactory( 536 void WebRtcVideoEngine2::SetExternalEncoderFactory(
(...skipping 2141 matching lines...) Expand 10 before | Expand all | Expand 10 after
2676 rtx_mapping[video_codecs[i].codec.id] != 2678 rtx_mapping[video_codecs[i].codec.id] !=
2677 ulpfec_config.red_payload_type) { 2679 ulpfec_config.red_payload_type) {
2678 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2680 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2679 } 2681 }
2680 } 2682 }
2681 2683
2682 return video_codecs; 2684 return video_codecs;
2683 } 2685 }
2684 2686
2685 } // namespace cricket 2687 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698