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

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

Issue 2617003003: Ensure internal_source is false for internal encoders. (Closed)
Patch Set: Created 3 years, 11 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 | no next file » | 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 1750 matching lines...) Expand 10 before | Expand all | Expand 10 after
1761 parameters_.config.encoder_settings.encoder = new_encoder.encoder; 1761 parameters_.config.encoder_settings.encoder = new_encoder.encoder;
1762 parameters_.config.encoder_settings.full_overuse_time = new_encoder.external; 1762 parameters_.config.encoder_settings.full_overuse_time = new_encoder.external;
1763 parameters_.config.encoder_settings.payload_name = codec_settings.codec.name; 1763 parameters_.config.encoder_settings.payload_name = codec_settings.codec.name;
1764 parameters_.config.encoder_settings.payload_type = codec_settings.codec.id; 1764 parameters_.config.encoder_settings.payload_type = codec_settings.codec.id;
1765 if (new_encoder.external) { 1765 if (new_encoder.external) {
1766 webrtc::VideoCodecType type = 1766 webrtc::VideoCodecType type =
1767 webrtc::PayloadNameToCodecType(codec_settings.codec.name) 1767 webrtc::PayloadNameToCodecType(codec_settings.codec.name)
1768 .value_or(webrtc::kVideoCodecUnknown); 1768 .value_or(webrtc::kVideoCodecUnknown);
1769 parameters_.config.encoder_settings.internal_source = 1769 parameters_.config.encoder_settings.internal_source =
1770 external_encoder_factory_->EncoderTypeHasInternalSource(type); 1770 external_encoder_factory_->EncoderTypeHasInternalSource(type);
1771 } else {
1772 parameters_.config.encoder_settings.internal_source = false;
nisse-chromium (ooo August 14) 2017/01/09 08:27:41 Does this function now set *all* attributes of par
noahric 2017/01/09 17:22:07 I'm not sure, but that's probably a good question
1771 } 1773 }
1772 parameters_.config.rtp.ulpfec = codec_settings.ulpfec; 1774 parameters_.config.rtp.ulpfec = codec_settings.ulpfec;
1773 parameters_.config.rtp.flexfec.flexfec_payload_type = 1775 parameters_.config.rtp.flexfec.flexfec_payload_type =
1774 codec_settings.flexfec_payload_type; 1776 codec_settings.flexfec_payload_type;
1775 1777
1776 // Set RTX payload type if RTX is enabled. 1778 // Set RTX payload type if RTX is enabled.
1777 if (!parameters_.config.rtp.rtx.ssrcs.empty()) { 1779 if (!parameters_.config.rtp.rtx.ssrcs.empty()) {
1778 if (codec_settings.rtx_payload_type == -1) { 1780 if (codec_settings.rtx_payload_type == -1) {
1779 LOG(LS_WARNING) << "RTX SSRCs configured but there's no configured RTX " 1781 LOG(LS_WARNING) << "RTX SSRCs configured but there's no configured RTX "
1780 "payload type. Ignoring."; 1782 "payload type. Ignoring.";
(...skipping 794 matching lines...) Expand 10 before | Expand all | Expand 10 after
2575 rtx_mapping[video_codecs[i].codec.id] != 2577 rtx_mapping[video_codecs[i].codec.id] !=
2576 ulpfec_config.red_payload_type) { 2578 ulpfec_config.red_payload_type) {
2577 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2579 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2578 } 2580 }
2579 } 2581 }
2580 2582
2581 return video_codecs; 2583 return video_codecs;
2582 } 2584 }
2583 2585
2584 } // namespace cricket 2586 } // namespace cricket
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698