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

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

Issue 2986893002: Piggybacking simulcast id and ALR experiment id into video content type extension. (Closed)
Patch Set: Remove static initialization from VideoContentType and remove memoization in AlrDetector Created 3 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
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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 if (!rtp_payload_registry_.GetPayloadSpecifics(last_media_payload_type, 540 if (!rtp_payload_registry_.GetPayloadSpecifics(last_media_payload_type,
541 &payload_specific)) { 541 &payload_specific)) {
542 LOG(LS_WARNING) << "Failed to get payload specifics."; 542 LOG(LS_WARNING) << "Failed to get payload specifics.";
543 return; 543 return;
544 } 544 }
545 rtp_header.type.Video.codec = payload_specific.Video.videoCodecType; 545 rtp_header.type.Video.codec = payload_specific.Video.videoCodecType;
546 rtp_header.type.Video.rotation = kVideoRotation_0; 546 rtp_header.type.Video.rotation = kVideoRotation_0;
547 if (header.extension.hasVideoRotation) { 547 if (header.extension.hasVideoRotation) {
548 rtp_header.type.Video.rotation = header.extension.videoRotation; 548 rtp_header.type.Video.rotation = header.extension.videoRotation;
549 } 549 }
550 rtp_header.type.Video.content_type = VideoContentType::UNSPECIFIED; 550 rtp_header.type.Video.content_type = VideoContentType::Unspecified();
551 if (header.extension.hasVideoContentType) { 551 if (header.extension.hasVideoContentType) {
552 rtp_header.type.Video.content_type = header.extension.videoContentType; 552 rtp_header.type.Video.content_type = header.extension.videoContentType;
553 } 553 }
554 rtp_header.type.Video.video_timing = {0u, 0u, 0u, 0u, 0u, 0u, false}; 554 rtp_header.type.Video.video_timing = {0u, 0u, 0u, 0u, 0u, 0u, false};
555 if (header.extension.has_video_timing) { 555 if (header.extension.has_video_timing) {
556 rtp_header.type.Video.video_timing = header.extension.video_timing; 556 rtp_header.type.Video.video_timing = header.extension.video_timing;
557 } 557 }
558 rtp_header.type.Video.playout_delay = header.extension.playout_delay; 558 rtp_header.type.Video.playout_delay = header.extension.playout_delay;
559 559
560 OnReceivedPayloadData(nullptr, 0, &rtp_header); 560 OnReceivedPayloadData(nullptr, 0, &rtp_header);
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
708 return; 708 return;
709 709
710 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str())) 710 if (!sprop_decoder.DecodeSprop(sprop_base64_it->second.c_str()))
711 return; 711 return;
712 712
713 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(), 713 tracker_.InsertSpsPpsNalus(sprop_decoder.sps_nalu(),
714 sprop_decoder.pps_nalu()); 714 sprop_decoder.pps_nalu());
715 } 715 }
716 716
717 } // namespace webrtc 717 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698