Index: webrtc/modules/rtp_rtcp/source/h264_sps_parser_unittest.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/h264_sps_parser_unittest.cc b/webrtc/modules/rtp_rtcp/source/h264_sps_parser_unittest.cc |
index ceadf4cb6b776620b18b24b80ea576947b867c3a..7a7e3ed2937a139ac87c35666015b415cfa71ccf 100644 |
--- a/webrtc/modules/rtp_rtcp/source/h264_sps_parser_unittest.cc |
+++ b/webrtc/modules/rtp_rtcp/source/h264_sps_parser_unittest.cc |
@@ -12,6 +12,7 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
+#include "webrtc/base/arraysize.h" |
#include "webrtc/base/bitbuffer.h" |
namespace webrtc { |
@@ -121,7 +122,7 @@ TEST(H264SpsParserTest, TestSampleSPSHdLandscape) { |
const uint8_t buffer[] = {0x7A, 0x00, 0x1F, 0xBC, 0xD9, 0x40, 0x50, 0x05, |
0xBA, 0x10, 0x00, 0x00, 0x03, 0x00, 0xC0, 0x00, |
0x00, 0x2A, 0xE0, 0xF1, 0x83, 0x19, 0x60}; |
- H264SpsParser parser = H264SpsParser(buffer, ARRAY_SIZE(buffer)); |
+ H264SpsParser parser = H264SpsParser(buffer, arraysize(buffer)); |
EXPECT_TRUE(parser.Parse()); |
EXPECT_EQ(1280u, parser.width()); |
EXPECT_EQ(720u, parser.height()); |
@@ -133,7 +134,7 @@ TEST(H264SpsParserTest, TestSampleSPSVgaLandscape) { |
const uint8_t buffer[] = {0x7A, 0x00, 0x1E, 0xBC, 0xD9, 0x40, 0xA0, 0x2F, |
0xF8, 0x98, 0x40, 0x00, 0x00, 0x03, 0x01, 0x80, |
0x00, 0x00, 0x56, 0x83, 0xC5, 0x8B, 0x65, 0x80}; |
- H264SpsParser parser = H264SpsParser(buffer, ARRAY_SIZE(buffer)); |
+ H264SpsParser parser = H264SpsParser(buffer, arraysize(buffer)); |
EXPECT_TRUE(parser.Parse()); |
EXPECT_EQ(640u, parser.width()); |
EXPECT_EQ(360u, parser.height()); |
@@ -145,7 +146,7 @@ TEST(H264SpsParserTest, TestSampleSPSWeirdResolution) { |
const uint8_t buffer[] = {0x7A, 0x00, 0x0D, 0xBC, 0xD9, 0x43, 0x43, 0x3E, |
0x5E, 0x10, 0x00, 0x00, 0x03, 0x00, 0x60, 0x00, |
0x00, 0x15, 0xA0, 0xF1, 0x42, 0x99, 0x60}; |
- H264SpsParser parser = H264SpsParser(buffer, ARRAY_SIZE(buffer)); |
+ H264SpsParser parser = H264SpsParser(buffer, arraysize(buffer)); |
EXPECT_TRUE(parser.Parse()); |
EXPECT_EQ(200u, parser.width()); |
EXPECT_EQ(400u, parser.height()); |
@@ -154,7 +155,7 @@ TEST(H264SpsParserTest, TestSampleSPSWeirdResolution) { |
TEST(H264SpsParserTest, TestSyntheticSPSQvgaLandscape) { |
uint8_t buffer[kSpsBufferMaxSize] = {0}; |
GenerateFakeSps(320u, 180u, buffer); |
- H264SpsParser parser = H264SpsParser(buffer, ARRAY_SIZE(buffer)); |
+ H264SpsParser parser = H264SpsParser(buffer, arraysize(buffer)); |
EXPECT_TRUE(parser.Parse()); |
EXPECT_EQ(320u, parser.width()); |
EXPECT_EQ(180u, parser.height()); |
@@ -163,7 +164,7 @@ TEST(H264SpsParserTest, TestSyntheticSPSQvgaLandscape) { |
TEST(H264SpsParserTest, TestSyntheticSPSWeirdResolution) { |
uint8_t buffer[kSpsBufferMaxSize] = {0}; |
GenerateFakeSps(156u, 122u, buffer); |
- H264SpsParser parser = H264SpsParser(buffer, ARRAY_SIZE(buffer)); |
+ H264SpsParser parser = H264SpsParser(buffer, arraysize(buffer)); |
EXPECT_TRUE(parser.Parse()); |
EXPECT_EQ(156u, parser.width()); |
EXPECT_EQ(122u, parser.height()); |