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

Side by Side Diff: media/cast/cast_defines.h

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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 // 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_CAST_DEFINES_H_ 5 #ifndef MEDIA_CAST_CAST_DEFINES_H_
6 #define MEDIA_CAST_CAST_DEFINES_H_ 6 #define MEDIA_CAST_CAST_DEFINES_H_
7 7
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 9
10 namespace media { 10 namespace media {
11 namespace cast { 11 namespace cast {
12 12
13 // TODO(miu): All remaining functions in this file are to be replaced with 13 // TODO(miu): All remaining functions in this file are to be replaced with
14 // methods in well-defined data types. http://crbug.com/530839 14 // methods in well-defined data types. http://crbug.com/530839
15 15
16 inline bool IsNewerFrameId(uint32 frame_id, uint32 prev_frame_id) { 16 inline bool IsNewerFrameId(uint32_t frame_id, uint32_t prev_frame_id) {
17 return (frame_id != prev_frame_id) && 17 return (frame_id != prev_frame_id) &&
18 static_cast<uint32>(frame_id - prev_frame_id) < 0x80000000; 18 static_cast<uint32_t>(frame_id - prev_frame_id) < 0x80000000;
19 } 19 }
20 20
21 inline bool IsNewerRtpTimestamp(uint32 timestamp, uint32 prev_timestamp) { 21 inline bool IsNewerRtpTimestamp(uint32_t timestamp, uint32_t prev_timestamp) {
22 return (timestamp != prev_timestamp) && 22 return (timestamp != prev_timestamp) &&
23 static_cast<uint32>(timestamp - prev_timestamp) < 0x80000000; 23 static_cast<uint32_t>(timestamp - prev_timestamp) < 0x80000000;
24 } 24 }
25 25
26 inline bool IsOlderFrameId(uint32 frame_id, uint32 prev_frame_id) { 26 inline bool IsOlderFrameId(uint32_t frame_id, uint32_t prev_frame_id) {
27 return (frame_id == prev_frame_id) || IsNewerFrameId(prev_frame_id, frame_id); 27 return (frame_id == prev_frame_id) || IsNewerFrameId(prev_frame_id, frame_id);
28 } 28 }
29 29
30 inline bool IsNewerPacketId(uint16 packet_id, uint16 prev_packet_id) { 30 inline bool IsNewerPacketId(uint16_t packet_id, uint16_t prev_packet_id) {
31 return (packet_id != prev_packet_id) && 31 return (packet_id != prev_packet_id) &&
32 static_cast<uint16>(packet_id - prev_packet_id) < 0x8000; 32 static_cast<uint16_t>(packet_id - prev_packet_id) < 0x8000;
33 } 33 }
34 34
35 inline bool IsNewerSequenceNumber(uint16 sequence_number, 35 inline bool IsNewerSequenceNumber(uint16_t sequence_number,
36 uint16 prev_sequence_number) { 36 uint16_t prev_sequence_number) {
37 // Same function as IsNewerPacketId just different data and name. 37 // Same function as IsNewerPacketId just different data and name.
38 return IsNewerPacketId(sequence_number, prev_sequence_number); 38 return IsNewerPacketId(sequence_number, prev_sequence_number);
39 } 39 }
40 40
41 inline base::TimeDelta RtpDeltaToTimeDelta(int64 rtp_delta, int rtp_timebase) { 41 inline base::TimeDelta RtpDeltaToTimeDelta(int64_t rtp_delta,
42 int rtp_timebase) {
42 DCHECK_GT(rtp_timebase, 0); 43 DCHECK_GT(rtp_timebase, 0);
43 return rtp_delta * base::TimeDelta::FromSeconds(1) / rtp_timebase; 44 return rtp_delta * base::TimeDelta::FromSeconds(1) / rtp_timebase;
44 } 45 }
45 46
46 inline int64 TimeDeltaToRtpDelta(base::TimeDelta delta, int rtp_timebase) { 47 inline int64_t TimeDeltaToRtpDelta(base::TimeDelta delta, int rtp_timebase) {
47 DCHECK_GT(rtp_timebase, 0); 48 DCHECK_GT(rtp_timebase, 0);
48 return delta * rtp_timebase / base::TimeDelta::FromSeconds(1); 49 return delta * rtp_timebase / base::TimeDelta::FromSeconds(1);
49 } 50 }
50 51
51 } // namespace cast 52 } // namespace cast
52 } // namespace media 53 } // namespace media
53 54
54 #endif // MEDIA_CAST_CAST_DEFINES_H_ 55 #endif // MEDIA_CAST_CAST_DEFINES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698