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 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
261 // that will be used. When we know the payload type insert the correct | 261 // that will be used. When we know the payload type insert the correct |
262 // sps/pps into the tracker. | 262 // sps/pps into the tracker. |
263 if (packet.payloadType != last_payload_type_) { | 263 if (packet.payloadType != last_payload_type_) { |
264 last_payload_type_ = packet.payloadType; | 264 last_payload_type_ = packet.payloadType; |
265 InsertSpsPpsIntoTracker(packet.payloadType); | 265 InsertSpsPpsIntoTracker(packet.payloadType); |
266 } | 266 } |
267 | 267 |
268 switch (tracker_.CopyAndFixBitstream(&packet)) { | 268 switch (tracker_.CopyAndFixBitstream(&packet)) { |
269 case video_coding::H264SpsPpsTracker::kRequestKeyframe: | 269 case video_coding::H264SpsPpsTracker::kRequestKeyframe: |
270 keyframe_request_sender_->RequestKeyFrame(); | 270 keyframe_request_sender_->RequestKeyFrame(); |
271 FALLTHROUGH(); | 271 RTC_FALLTHROUGH(); |
272 case video_coding::H264SpsPpsTracker::kDrop: | 272 case video_coding::H264SpsPpsTracker::kDrop: |
273 return 0; | 273 return 0; |
274 case video_coding::H264SpsPpsTracker::kInsert: | 274 case video_coding::H264SpsPpsTracker::kInsert: |
275 break; | 275 break; |
276 } | 276 } |
277 | 277 |
278 } else { | 278 } else { |
279 uint8_t* data = new uint8_t[packet.sizeBytes]; | 279 uint8_t* data = new uint8_t[packet.sizeBytes]; |
280 memcpy(data, packet.dataPtr, packet.sizeBytes); | 280 memcpy(data, packet.dataPtr, packet.sizeBytes); |
281 packet.dataPtr = data; | 281 packet.dataPtr = data; |
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 |
OLD | NEW |