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

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

Issue 2995953002: Revert of Add a flags field to video timing extension. (Closed)
Patch Set: Created 3 years, 4 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/video/payload_router.cc ('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 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 if (header.extension.hasVideoRotation) { 553 if (header.extension.hasVideoRotation) {
554 rtp_header.type.Video.rotation = header.extension.videoRotation; 554 rtp_header.type.Video.rotation = header.extension.videoRotation;
555 } 555 }
556 rtp_header.type.Video.content_type = VideoContentType::UNSPECIFIED; 556 rtp_header.type.Video.content_type = VideoContentType::UNSPECIFIED;
557 if (header.extension.hasVideoContentType) { 557 if (header.extension.hasVideoContentType) {
558 rtp_header.type.Video.content_type = header.extension.videoContentType; 558 rtp_header.type.Video.content_type = header.extension.videoContentType;
559 } 559 }
560 rtp_header.type.Video.video_timing = {0u, 0u, 0u, 0u, 0u, 0u, false}; 560 rtp_header.type.Video.video_timing = {0u, 0u, 0u, 0u, 0u, 0u, false};
561 if (header.extension.has_video_timing) { 561 if (header.extension.has_video_timing) {
562 rtp_header.type.Video.video_timing = header.extension.video_timing; 562 rtp_header.type.Video.video_timing = header.extension.video_timing;
563 rtp_header.type.Video.video_timing.is_timing_frame = true;
563 } 564 }
564 rtp_header.type.Video.playout_delay = header.extension.playout_delay; 565 rtp_header.type.Video.playout_delay = header.extension.playout_delay;
565 566
566 OnReceivedPayloadData(nullptr, 0, &rtp_header); 567 OnReceivedPayloadData(nullptr, 0, &rtp_header);
567 } 568 }
568 569
569 bool RtpVideoStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet, 570 bool RtpVideoStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet,
570 size_t rtcp_packet_length) { 571 size_t rtcp_packet_length) {
571 { 572 {
572 rtc::CritScope lock(&receive_cs_); 573 rtc::CritScope lock(&receive_cs_);
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
715 return; 716 return;
716 717
717 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str())) 718 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str()))
718 return; 719 return;
719 720
720 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(), 721 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(),
721 sprop_decoder.pps_nalu()); 722 sprop_decoder.pps_nalu());
722 } 723 }
723 724
724 } // namespace webrtc 725 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/payload_router.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698