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

Side by Side Diff: talk/media/base/testutils.h

Issue 1405023016: Convert usage of ARRAY_SIZE to arraysize. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: static_cast<int> Created 5 years, 1 month 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
« no previous file with comments | « talk/media/base/streamparams_unittest.cc ('k') | talk/media/base/testutils.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 17 matching lines...) Expand all
28 #ifndef TALK_MEDIA_BASE_TESTUTILS_H_ 28 #ifndef TALK_MEDIA_BASE_TESTUTILS_H_
29 #define TALK_MEDIA_BASE_TESTUTILS_H_ 29 #define TALK_MEDIA_BASE_TESTUTILS_H_
30 30
31 #include <string> 31 #include <string>
32 #include <vector> 32 #include <vector>
33 33
34 #include "libyuv/compare.h" 34 #include "libyuv/compare.h"
35 #include "talk/media/base/mediachannel.h" 35 #include "talk/media/base/mediachannel.h"
36 #include "talk/media/base/videocapturer.h" 36 #include "talk/media/base/videocapturer.h"
37 #include "talk/media/base/videocommon.h" 37 #include "talk/media/base/videocommon.h"
38 #include "webrtc/base/arraysize.h"
38 #include "webrtc/base/basictypes.h" 39 #include "webrtc/base/basictypes.h"
39 #include "webrtc/base/sigslot.h" 40 #include "webrtc/base/sigslot.h"
40 #include "webrtc/base/window.h" 41 #include "webrtc/base/window.h"
41 42
42 namespace rtc { 43 namespace rtc {
43 class ByteBuffer; 44 class ByteBuffer;
44 class StreamInterface; 45 class StreamInterface;
45 } 46 }
46 47
47 namespace cricket { 48 namespace cricket {
48 49
49 // Returns size of 420 image with rounding on chroma for odd sizes. 50 // Returns size of 420 image with rounding on chroma for odd sizes.
50 #define I420_SIZE(w, h) (w * h + (((w + 1) / 2) * ((h + 1) / 2)) * 2) 51 #define I420_SIZE(w, h) (w * h + (((w + 1) / 2) * ((h + 1) / 2)) * 2)
51 // Returns size of ARGB image. 52 // Returns size of ARGB image.
52 #define ARGB_SIZE(w, h) (w * h * 4) 53 #define ARGB_SIZE(w, h) (w * h * 4)
53 54
54 template <class T> inline std::vector<T> MakeVector(const T a[], size_t s) { 55 template <class T> inline std::vector<T> MakeVector(const T a[], size_t s) {
55 return std::vector<T>(a, a + s); 56 return std::vector<T>(a, a + s);
56 } 57 }
57 #define MAKE_VECTOR(a) cricket::MakeVector(a, ARRAY_SIZE(a)) 58 #define MAKE_VECTOR(a) cricket::MakeVector(a, arraysize(a))
58 59
59 struct RtpDumpPacket; 60 struct RtpDumpPacket;
60 class RtpDumpWriter; 61 class RtpDumpWriter;
61 class VideoFrame; 62 class VideoFrame;
62 63
63 struct RawRtpPacket { 64 struct RawRtpPacket {
64 void WriteToByteBuffer(uint32_t in_ssrc, rtc::ByteBuffer* buf) const; 65 void WriteToByteBuffer(uint32_t in_ssrc, rtc::ByteBuffer* buf) const;
65 bool ReadFromByteBuffer(rtc::ByteBuffer* buf); 66 bool ReadFromByteBuffer(rtc::ByteBuffer* buf);
66 // Check if this packet is the same as the specified packet except the 67 // Check if this packet is the same as the specified packet except the
67 // sequence number and timestamp, which should be the same as the specified 68 // sequence number and timestamp, which should be the same as the specified
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 // Create Simulcast stream with given |ssrcs| and |rtx_ssrcs|. 240 // Create Simulcast stream with given |ssrcs| and |rtx_ssrcs|.
240 // The number of |rtx_ssrcs| must match number of |ssrcs|. 241 // The number of |rtx_ssrcs| must match number of |ssrcs|.
241 cricket::StreamParams CreateSimWithRtxStreamParams( 242 cricket::StreamParams CreateSimWithRtxStreamParams(
242 const std::string& cname, 243 const std::string& cname,
243 const std::vector<uint32_t>& ssrcs, 244 const std::vector<uint32_t>& ssrcs,
244 const std::vector<uint32_t>& rtx_ssrcs); 245 const std::vector<uint32_t>& rtx_ssrcs);
245 246
246 } // namespace cricket 247 } // namespace cricket
247 248
248 #endif // TALK_MEDIA_BASE_TESTUTILS_H_ 249 #endif // TALK_MEDIA_BASE_TESTUTILS_H_
OLDNEW
« no previous file with comments | « talk/media/base/streamparams_unittest.cc ('k') | talk/media/base/testutils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698