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

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

Issue 1754283002: Make ReconfigureVideoEncoder void. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Kbps Created 4 years, 9 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 | « webrtc/media/engine/fakewebrtccall.cc ('k') | webrtc/video/video_send_stream.h » ('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 1863 matching lines...) Expand 10 before | Expand all | Expand 10 after
1874 1874
1875 RTC_CHECK(parameters_.codec_settings); 1875 RTC_CHECK(parameters_.codec_settings);
1876 VideoCodecSettings codec_settings = *parameters_.codec_settings; 1876 VideoCodecSettings codec_settings = *parameters_.codec_settings;
1877 1877
1878 webrtc::VideoEncoderConfig encoder_config = 1878 webrtc::VideoEncoderConfig encoder_config =
1879 CreateVideoEncoderConfig(last_dimensions_, codec_settings.codec); 1879 CreateVideoEncoderConfig(last_dimensions_, codec_settings.codec);
1880 1880
1881 encoder_config.encoder_specific_settings = ConfigureVideoEncoderSettings( 1881 encoder_config.encoder_specific_settings = ConfigureVideoEncoderSettings(
1882 codec_settings.codec); 1882 codec_settings.codec);
1883 1883
1884 bool stream_reconfigured = stream_->ReconfigureVideoEncoder(encoder_config); 1884 stream_->ReconfigureVideoEncoder(encoder_config);
1885 1885
1886 encoder_config.encoder_specific_settings = NULL; 1886 encoder_config.encoder_specific_settings = NULL;
1887 pending_encoder_reconfiguration_ = false; 1887 pending_encoder_reconfiguration_ = false;
1888 1888
1889 if (!stream_reconfigured) {
1890 return;
1891 }
1892
1893 parameters_.encoder_config = encoder_config; 1889 parameters_.encoder_config = encoder_config;
1894 } 1890 }
1895 1891
1896 void WebRtcVideoChannel2::WebRtcVideoSendStream::Start() { 1892 void WebRtcVideoChannel2::WebRtcVideoSendStream::Start() {
1897 rtc::CritScope cs(&lock_); 1893 rtc::CritScope cs(&lock_);
1898 RTC_DCHECK(stream_ != NULL); 1894 RTC_DCHECK(stream_ != NULL);
1899 stream_->Start(); 1895 stream_->Start();
1900 sending_ = true; 1896 sending_ = true;
1901 } 1897 }
1902 1898
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
2518 rtx_mapping[video_codecs[i].codec.id] != 2514 rtx_mapping[video_codecs[i].codec.id] !=
2519 fec_settings.red_payload_type) { 2515 fec_settings.red_payload_type) {
2520 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2516 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2521 } 2517 }
2522 } 2518 }
2523 2519
2524 return video_codecs; 2520 return video_codecs;
2525 } 2521 }
2526 2522
2527 } // namespace cricket 2523 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/engine/fakewebrtccall.cc ('k') | webrtc/video/video_send_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698