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

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

Issue 2535593002: RTC_[D]CHECK_op: Remove "u" suffix on integer constants (Closed)
Patch Set: Created 4 years 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 1763 matching lines...) Expand 10 before | Expand all | Expand 10 after
1774 if (encoder->external) { 1774 if (encoder->external) {
1775 external_encoder_factory_->DestroyVideoEncoder(encoder->external_encoder); 1775 external_encoder_factory_->DestroyVideoEncoder(encoder->external_encoder);
1776 } 1776 }
1777 delete encoder->encoder; 1777 delete encoder->encoder;
1778 } 1778 }
1779 1779
1780 void WebRtcVideoChannel2::WebRtcVideoSendStream::SetCodec( 1780 void WebRtcVideoChannel2::WebRtcVideoSendStream::SetCodec(
1781 const VideoCodecSettings& codec_settings) { 1781 const VideoCodecSettings& codec_settings) {
1782 RTC_DCHECK_RUN_ON(&thread_checker_); 1782 RTC_DCHECK_RUN_ON(&thread_checker_);
1783 parameters_.encoder_config = CreateVideoEncoderConfig(codec_settings.codec); 1783 parameters_.encoder_config = CreateVideoEncoderConfig(codec_settings.codec);
1784 RTC_DCHECK_GT(parameters_.encoder_config.number_of_streams, 0u); 1784 RTC_DCHECK_GT(parameters_.encoder_config.number_of_streams, 0);
1785 1785
1786 AllocatedEncoder new_encoder = CreateVideoEncoder(codec_settings.codec); 1786 AllocatedEncoder new_encoder = CreateVideoEncoder(codec_settings.codec);
1787 parameters_.config.encoder_settings.encoder = new_encoder.encoder; 1787 parameters_.config.encoder_settings.encoder = new_encoder.encoder;
1788 parameters_.config.encoder_settings.full_overuse_time = new_encoder.external; 1788 parameters_.config.encoder_settings.full_overuse_time = new_encoder.external;
1789 parameters_.config.encoder_settings.payload_name = codec_settings.codec.name; 1789 parameters_.config.encoder_settings.payload_name = codec_settings.codec.name;
1790 parameters_.config.encoder_settings.payload_type = codec_settings.codec.id; 1790 parameters_.config.encoder_settings.payload_type = codec_settings.codec.id;
1791 if (new_encoder.external) { 1791 if (new_encoder.external) {
1792 webrtc::VideoCodecType type = 1792 webrtc::VideoCodecType type =
1793 webrtc::PayloadNameToCodecType(codec_settings.codec.name) 1793 webrtc::PayloadNameToCodecType(codec_settings.codec.name)
1794 .value_or(webrtc::kVideoCodecUnknown); 1794 .value_or(webrtc::kVideoCodecUnknown);
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
1955 } 1955 }
1956 1956
1957 void WebRtcVideoChannel2::WebRtcVideoSendStream::ReconfigureEncoder() { 1957 void WebRtcVideoChannel2::WebRtcVideoSendStream::ReconfigureEncoder() {
1958 RTC_DCHECK_RUN_ON(&thread_checker_); 1958 RTC_DCHECK_RUN_ON(&thread_checker_);
1959 if (!stream_) { 1959 if (!stream_) {
1960 // The webrtc::VideoSendStream |stream_|has not yet been created but other 1960 // The webrtc::VideoSendStream |stream_|has not yet been created but other
1961 // parameters has changed. 1961 // parameters has changed.
1962 return; 1962 return;
1963 } 1963 }
1964 1964
1965 RTC_DCHECK_GT(parameters_.encoder_config.number_of_streams, 0u); 1965 RTC_DCHECK_GT(parameters_.encoder_config.number_of_streams, 0);
1966 1966
1967 RTC_CHECK(parameters_.codec_settings); 1967 RTC_CHECK(parameters_.codec_settings);
1968 VideoCodecSettings codec_settings = *parameters_.codec_settings; 1968 VideoCodecSettings codec_settings = *parameters_.codec_settings;
1969 1969
1970 webrtc::VideoEncoderConfig encoder_config = 1970 webrtc::VideoEncoderConfig encoder_config =
1971 CreateVideoEncoderConfig(codec_settings.codec); 1971 CreateVideoEncoderConfig(codec_settings.codec);
1972 1972
1973 encoder_config.encoder_specific_settings = ConfigureVideoEncoderSettings( 1973 encoder_config.encoder_specific_settings = ConfigureVideoEncoderSettings(
1974 codec_settings.codec); 1974 codec_settings.codec);
1975 1975
(...skipping 628 matching lines...) Expand 10 before | Expand all | Expand 10 after
2604 rtx_mapping[video_codecs[i].codec.id] != 2604 rtx_mapping[video_codecs[i].codec.id] !=
2605 ulpfec_config.red_payload_type) { 2605 ulpfec_config.red_payload_type) {
2606 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2606 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2607 } 2607 }
2608 } 2608 }
2609 2609
2610 return video_codecs; 2610 return video_codecs;
2611 } 2611 }
2612 2612
2613 } // namespace cricket 2613 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/common_audio/wav_file.cc ('k') | webrtc/modules/audio_coding/acm2/audio_coding_module.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698