| OLD | NEW |
| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 if (rtp_header->header.extension.hasVideoRotation) { | 96 if (rtp_header->header.extension.hasVideoRotation) { |
| 97 rtp_header->type.Video.rotation = | 97 rtp_header->type.Video.rotation = |
| 98 rtp_header->header.extension.videoRotation; | 98 rtp_header->header.extension.videoRotation; |
| 99 } | 99 } |
| 100 | 100 |
| 101 if (rtp_header->header.extension.hasVideoContentType) { | 101 if (rtp_header->header.extension.hasVideoContentType) { |
| 102 rtp_header->type.Video.content_type = | 102 rtp_header->type.Video.content_type = |
| 103 rtp_header->header.extension.videoContentType; | 103 rtp_header->header.extension.videoContentType; |
| 104 } | 104 } |
| 105 | 105 |
| 106 if (rtp_header->header.extension.hasVideoTiming) { |
| 107 rtp_header->type.Video.video_timing = |
| 108 rtp_header->header.extension.videoTiming; |
| 109 rtp_header->type.Video.video_timing.is_timing_frame = true; |
| 110 } else { |
| 111 rtp_header->type.Video.video_timing.is_timing_frame = false; |
| 112 } |
| 113 |
| 106 rtp_header->type.Video.playout_delay = | 114 rtp_header->type.Video.playout_delay = |
| 107 rtp_header->header.extension.playout_delay; | 115 rtp_header->header.extension.playout_delay; |
| 108 | 116 |
| 109 return data_callback_->OnReceivedPayloadData(parsed_payload.payload, | 117 return data_callback_->OnReceivedPayloadData(parsed_payload.payload, |
| 110 parsed_payload.payload_length, | 118 parsed_payload.payload_length, |
| 111 rtp_header) == 0 | 119 rtp_header) == 0 |
| 112 ? 0 | 120 ? 0 |
| 113 : -1; | 121 : -1; |
| 114 } | 122 } |
| 115 | 123 |
| 116 RTPAliveType RTPReceiverVideo::ProcessDeadOrAlive( | 124 RTPAliveType RTPReceiverVideo::ProcessDeadOrAlive( |
| 117 uint16_t last_payload_length) const { | 125 uint16_t last_payload_length) const { |
| 118 return kRtpDead; | 126 return kRtpDead; |
| 119 } | 127 } |
| 120 | 128 |
| 121 int32_t RTPReceiverVideo::InvokeOnInitializeDecoder( | 129 int32_t RTPReceiverVideo::InvokeOnInitializeDecoder( |
| 122 RtpFeedback* callback, | 130 RtpFeedback* callback, |
| 123 int8_t payload_type, | 131 int8_t payload_type, |
| 124 const char payload_name[RTP_PAYLOAD_NAME_SIZE], | 132 const char payload_name[RTP_PAYLOAD_NAME_SIZE], |
| 125 const PayloadUnion& specific_payload) const { | 133 const PayloadUnion& specific_payload) const { |
| 126 // TODO(pbos): Remove as soon as audio can handle a changing payload type | 134 // TODO(pbos): Remove as soon as audio can handle a changing payload type |
| 127 // without this callback. | 135 // without this callback. |
| 128 return 0; | 136 return 0; |
| 129 } | 137 } |
| 130 | 138 |
| 131 } // namespace webrtc | 139 } // namespace webrtc |
| OLD | NEW |