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

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

Issue 1757853002: Make sure rotation is not applied by the capturer if the CVO exenstion is set before the send strea… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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 | « 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 1491 matching lines...) Expand 10 before | Expand all | Expand 10 after
1502 sp.GetFidSsrcs(parameters_.config.rtp.ssrcs, 1502 sp.GetFidSsrcs(parameters_.config.rtp.ssrcs,
1503 &parameters_.config.rtp.rtx.ssrcs); 1503 &parameters_.config.rtp.rtx.ssrcs);
1504 parameters_.config.rtp.c_name = sp.cname; 1504 parameters_.config.rtp.c_name = sp.cname;
1505 parameters_.config.rtp.extensions = rtp_extensions; 1505 parameters_.config.rtp.extensions = rtp_extensions;
1506 parameters_.config.rtp.rtcp_mode = send_params.rtcp.reduced_size 1506 parameters_.config.rtp.rtcp_mode = send_params.rtcp.reduced_size
1507 ? webrtc::RtcpMode::kReducedSize 1507 ? webrtc::RtcpMode::kReducedSize
1508 : webrtc::RtcpMode::kCompound; 1508 : webrtc::RtcpMode::kCompound;
1509 parameters_.config.overuse_callback = 1509 parameters_.config.overuse_callback =
1510 enable_cpu_overuse_detection ? this : nullptr; 1510 enable_cpu_overuse_detection ? this : nullptr;
1511 1511
1512 sink_wants_.rotation_applied = !ContainsHeaderExtension(
1513 rtp_extensions, kRtpVideoRotationHeaderExtension);
1514
1512 if (codec_settings) { 1515 if (codec_settings) {
1513 SetCodec(*codec_settings); 1516 SetCodec(*codec_settings);
1514 } 1517 }
1515 } 1518 }
1516 1519
1517 WebRtcVideoChannel2::WebRtcVideoSendStream::~WebRtcVideoSendStream() { 1520 WebRtcVideoChannel2::WebRtcVideoSendStream::~WebRtcVideoSendStream() {
1518 DisconnectCapturer(); 1521 DisconnectCapturer();
1519 if (stream_ != NULL) { 1522 if (stream_ != NULL) {
1520 call_->DestroyVideoSendStream(stream_); 1523 call_->DestroyVideoSendStream(stream_);
1521 } 1524 }
(...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after
2517 rtx_mapping[video_codecs[i].codec.id] != 2520 rtx_mapping[video_codecs[i].codec.id] !=
2518 fec_settings.red_payload_type) { 2521 fec_settings.red_payload_type) {
2519 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2522 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2520 } 2523 }
2521 } 2524 }
2522 2525
2523 return video_codecs; 2526 return video_codecs;
2524 } 2527 }
2525 2528
2526 } // namespace cricket 2529 } // 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