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

Side by Side Diff: webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc

Issue 2911193002: Implement timing frames. (Closed)
Patch Set: Implement Holmer@ comments Created 3 years, 6 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 rtp_header->type.Video.is_first_packet_in_frame = is_first_packet; 85 rtp_header->type.Video.is_first_packet_in_frame = is_first_packet;
86 RtpDepacketizer::ParsedPayload parsed_payload; 86 RtpDepacketizer::ParsedPayload parsed_payload;
87 if (!depacketizer->Parse(&parsed_payload, payload, payload_data_length)) 87 if (!depacketizer->Parse(&parsed_payload, payload, payload_data_length))
88 return -1; 88 return -1;
89 89
90 rtp_header->frameType = parsed_payload.frame_type; 90 rtp_header->frameType = parsed_payload.frame_type;
91 rtp_header->type = parsed_payload.type; 91 rtp_header->type = parsed_payload.type;
92 rtp_header->type.Video.rotation = kVideoRotation_0; 92 rtp_header->type.Video.rotation = kVideoRotation_0;
93 rtp_header->type.Video.content_type = VideoContentType::UNSPECIFIED; 93 rtp_header->type.Video.content_type = VideoContentType::UNSPECIFIED;
94 rtp_header->type.Video.video_timing.is_timing_frame = false;
94 95
95 // Retrieve the video rotation information. 96 // Retrieve the video rotation information.
96 if (rtp_header->header.extension.hasVideoRotation) { 97 if (rtp_header->header.extension.hasVideoRotation) {
97 rtp_header->type.Video.rotation = 98 rtp_header->type.Video.rotation =
98 rtp_header->header.extension.videoRotation; 99 rtp_header->header.extension.videoRotation;
99 } 100 }
100 101
101 if (rtp_header->header.extension.hasVideoContentType) { 102 if (rtp_header->header.extension.hasVideoContentType) {
102 rtp_header->type.Video.content_type = 103 rtp_header->type.Video.content_type =
103 rtp_header->header.extension.videoContentType; 104 rtp_header->header.extension.videoContentType;
104 } 105 }
105 106
107 if (rtp_header->header.extension.has_video_timing) {
108 rtp_header->type.Video.video_timing =
109 rtp_header->header.extension.video_timing;
110 rtp_header->type.Video.video_timing.is_timing_frame = true;
111 }
112
106 rtp_header->type.Video.playout_delay = 113 rtp_header->type.Video.playout_delay =
107 rtp_header->header.extension.playout_delay; 114 rtp_header->header.extension.playout_delay;
108 115
109 return data_callback_->OnReceivedPayloadData(parsed_payload.payload, 116 return data_callback_->OnReceivedPayloadData(parsed_payload.payload,
110 parsed_payload.payload_length, 117 parsed_payload.payload_length,
111 rtp_header) == 0 118 rtp_header) == 0
112 ? 0 119 ? 0
113 : -1; 120 : -1;
114 } 121 }
115 122
116 RTPAliveType RTPReceiverVideo::ProcessDeadOrAlive( 123 RTPAliveType RTPReceiverVideo::ProcessDeadOrAlive(
117 uint16_t last_payload_length) const { 124 uint16_t last_payload_length) const {
118 return kRtpDead; 125 return kRtpDead;
119 } 126 }
120 127
121 int32_t RTPReceiverVideo::InvokeOnInitializeDecoder( 128 int32_t RTPReceiverVideo::InvokeOnInitializeDecoder(
122 RtpFeedback* callback, 129 RtpFeedback* callback,
123 int8_t payload_type, 130 int8_t payload_type,
124 const char payload_name[RTP_PAYLOAD_NAME_SIZE], 131 const char payload_name[RTP_PAYLOAD_NAME_SIZE],
125 const PayloadUnion& specific_payload) const { 132 const PayloadUnion& specific_payload) const {
126 // TODO(pbos): Remove as soon as audio can handle a changing payload type 133 // TODO(pbos): Remove as soon as audio can handle a changing payload type
127 // without this callback. 134 // without this callback.
128 return 0; 135 return 0;
129 } 136 }
130 137
131 } // namespace webrtc 138 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h ('k') | webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698