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

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

Issue 2772033002: Add content type information to encoded images and corresponding rtp extension header (Closed)
Patch Set: Fix typo, leading to failed video catpure test Created 3 years, 8 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/receive_statistics_proxy_unittest.cc ('k') | webrtc/video/video_quality_test.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) 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 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 if (!rtp_payload_registry_.GetPayloadSpecifics(last_media_payload_type, 495 if (!rtp_payload_registry_.GetPayloadSpecifics(last_media_payload_type,
496 &payload_specific)) { 496 &payload_specific)) {
497 LOG(LS_WARNING) << "Failed to get payload specifics."; 497 LOG(LS_WARNING) << "Failed to get payload specifics.";
498 return; 498 return;
499 } 499 }
500 rtp_header.type.Video.codec = payload_specific.Video.videoCodecType; 500 rtp_header.type.Video.codec = payload_specific.Video.videoCodecType;
501 rtp_header.type.Video.rotation = kVideoRotation_0; 501 rtp_header.type.Video.rotation = kVideoRotation_0;
502 if (header.extension.hasVideoRotation) { 502 if (header.extension.hasVideoRotation) {
503 rtp_header.type.Video.rotation = header.extension.videoRotation; 503 rtp_header.type.Video.rotation = header.extension.videoRotation;
504 } 504 }
505 rtp_header.type.Video.content_type = VideoContentType::UNSPECIFIED;
506 if (header.extension.hasVideoContentType) {
507 rtp_header.type.Video.content_type = header.extension.videoContentType;
508 }
505 rtp_header.type.Video.playout_delay = header.extension.playout_delay; 509 rtp_header.type.Video.playout_delay = header.extension.playout_delay;
506 510
507 OnReceivedPayloadData(nullptr, 0, &rtp_header); 511 OnReceivedPayloadData(nullptr, 0, &rtp_header);
508 } 512 }
509 513
510 bool RtpStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet, 514 bool RtpStreamReceiver::DeliverRtcp(const uint8_t* rtcp_packet,
511 size_t rtcp_packet_length) { 515 size_t rtcp_packet_length) {
512 { 516 {
513 rtc::CritScope lock(&receive_cs_); 517 rtc::CritScope lock(&receive_cs_);
514 if (!receiving_) { 518 if (!receiving_) {
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 return; 660 return;
657 661
658 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str())) 662 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str()))
659 return; 663 return;
660 664
661 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(), 665 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(),
662 sprop_decoder.pps_nalu()); 666 sprop_decoder.pps_nalu());
663 } 667 }
664 668
665 } // namespace webrtc 669 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/video/receive_statistics_proxy_unittest.cc ('k') | webrtc/video/video_quality_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698