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

Side by Side Diff: webrtc/video/rtp_stream_receiver.cc

Issue 2320913003: Reland of Ignore Camera and Flip bits in CVO when parsing video rotation (Closed)
Patch Set: Created 4 years, 3 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/sdk/DEPS ('k') | 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) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 425 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 rtp_header.header.paddingLength = 0; 436 rtp_header.header.paddingLength = 0;
437 PayloadUnion payload_specific; 437 PayloadUnion payload_specific;
438 if (!rtp_payload_registry_.GetPayloadSpecifics(last_media_payload_type, 438 if (!rtp_payload_registry_.GetPayloadSpecifics(last_media_payload_type,
439 &payload_specific)) { 439 &payload_specific)) {
440 LOG(LS_WARNING) << "Failed to get payload specifics."; 440 LOG(LS_WARNING) << "Failed to get payload specifics.";
441 return; 441 return;
442 } 442 }
443 rtp_header.type.Video.codec = payload_specific.Video.videoCodecType; 443 rtp_header.type.Video.codec = payload_specific.Video.videoCodecType;
444 rtp_header.type.Video.rotation = kVideoRotation_0; 444 rtp_header.type.Video.rotation = kVideoRotation_0;
445 if (header.extension.hasVideoRotation) { 445 if (header.extension.hasVideoRotation) {
446 rtp_header.type.Video.rotation = 446 rtp_header.type.Video.rotation = header.extension.videoRotation;
447 ConvertCVOByteToVideoRotation(header.extension.videoRotation);
448 } 447 }
449 rtp_header.type.Video.playout_delay = header.extension.playout_delay; 448 rtp_header.type.Video.playout_delay = header.extension.playout_delay;
450 449
451 OnReceivedPayloadData(nullptr, 0, &rtp_header); 450 OnReceivedPayloadData(nullptr, 0, &rtp_header);
452 } 451 }
453 452
454 bool RtpStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet, 453 bool RtpStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet,
455 size_t rtcp_packet_length) { 454 size_t rtcp_packet_length) {
456 { 455 {
457 rtc::CritScope lock(&receive_cs_); 456 rtc::CritScope lock(&receive_cs_);
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
539 const std::string& extension, int id) { 538 const std::string& extension, int id) {
540 // One-byte-extension local identifiers are in the range 1-14 inclusive. 539 // One-byte-extension local identifiers are in the range 1-14 inclusive.
541 RTC_DCHECK_GE(id, 1); 540 RTC_DCHECK_GE(id, 1);
542 RTC_DCHECK_LE(id, 14); 541 RTC_DCHECK_LE(id, 14);
543 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension)); 542 RTC_DCHECK(RtpExtension::IsSupportedForVideo(extension));
544 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension( 543 RTC_CHECK(rtp_header_parser_->RegisterRtpHeaderExtension(
545 StringToRtpExtensionType(extension), id)); 544 StringToRtpExtensionType(extension), id));
546 } 545 }
547 546
548 } // namespace webrtc 547 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/sdk/DEPS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698