| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef MEDIA_CAST_RTP_COMMON_RTP_DEFINES_H_ | 5 #ifndef MEDIA_CAST_RTP_COMMON_RTP_DEFINES_H_ |
| 6 #define MEDIA_CAST_RTP_COMMON_RTP_DEFINES_H_ | 6 #define MEDIA_CAST_RTP_COMMON_RTP_DEFINES_H_ |
| 7 | 7 |
| 8 #include <cstring> | 8 #include <cstring> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "media/cast/cast_config.h" | 11 #include "media/cast/cast_config.h" |
| 12 #include "media/cast/rtcp/rtcp_defines.h" | 12 #include "media/cast/rtcp/rtcp_defines.h" |
| 13 | |
| 14 #include "third_party/webrtc/modules/interface/module_common_types.h" | 13 #include "third_party/webrtc/modules/interface/module_common_types.h" |
| 15 | 14 |
| 16 namespace media { | 15 namespace media { |
| 17 namespace cast { | 16 namespace cast { |
| 18 | 17 |
| 19 const uint8 kRtpMarkerBitMask = 0x80; | 18 const uint8 kRtpMarkerBitMask = 0x80; |
| 20 | 19 |
| 21 struct RtpCastHeader { | 20 struct RtpCastHeader { |
| 22 void InitRTPVideoHeaderCast() { | 21 void InitRTPVideoHeaderCast() { |
| 23 is_key_frame = false; | 22 is_key_frame = false; |
| (...skipping 24 matching lines...) Expand all Loading... |
| 48 | 47 |
| 49 inline bool IsNewerFrameId(uint8 frame_id, uint8 prev_frame_id) { | 48 inline bool IsNewerFrameId(uint8 frame_id, uint8 prev_frame_id) { |
| 50 return (frame_id != prev_frame_id) && | 49 return (frame_id != prev_frame_id) && |
| 51 static_cast<uint8>(frame_id - prev_frame_id) < 0x80; | 50 static_cast<uint8>(frame_id - prev_frame_id) < 0x80; |
| 52 } | 51 } |
| 53 | 52 |
| 54 inline bool IsOlderFrameId(uint8 frame_id, uint8 prev_frame_id) { | 53 inline bool IsOlderFrameId(uint8 frame_id, uint8 prev_frame_id) { |
| 55 return (frame_id == prev_frame_id) || IsNewerFrameId(prev_frame_id, frame_id); | 54 return (frame_id == prev_frame_id) || IsNewerFrameId(prev_frame_id, frame_id); |
| 56 } | 55 } |
| 57 | 56 |
| 58 inline bool IsNewerPacketId(uint16 packet_id, | 57 inline bool IsNewerPacketId(uint16 packet_id, uint16 prev_packet_id) { |
| 59 uint16 prev_packet_id) { | |
| 60 return (packet_id != prev_packet_id) && | 58 return (packet_id != prev_packet_id) && |
| 61 static_cast<uint16>(packet_id - prev_packet_id) < 0x8000; | 59 static_cast<uint16>(packet_id - prev_packet_id) < 0x8000; |
| 62 } | 60 } |
| 63 | 61 |
| 64 inline bool IsNewerSequenceNumber(uint16 sequence_number, | 62 inline bool IsNewerSequenceNumber(uint16 sequence_number, |
| 65 uint16 prev_sequence_number) { | 63 uint16 prev_sequence_number) { |
| 66 // Same function as IsNewerPacketId just different data and name. | 64 // Same function as IsNewerPacketId just different data and name. |
| 67 return IsNewerPacketId(sequence_number, prev_sequence_number); | 65 return IsNewerPacketId(sequence_number, prev_sequence_number); |
| 68 } | 66 } |
| 69 | 67 |
| 70 } // namespace cast | 68 } // namespace cast |
| 71 } // namespace media | 69 } // namespace media |
| 70 |
| 72 #endif // MEDIA_CAST_RTP_COMMON_RTP_DEFINES_H_ | 71 #endif // MEDIA_CAST_RTP_COMMON_RTP_DEFINES_H_ |
| OLD | NEW |