From 0b0a8a721aed760e65fa1d340b3bb4cd48303f62 Mon Sep 17 00:00:00 2001 From: KongQun Yang Date: Wed, 17 Feb 2016 15:50:55 -0800 Subject: [PATCH] Fix unittest break in Mac due to C++11 incompatibility Fixes Issue #80 Change-Id: I17bb0706cf99b77fa879f86805017462e5027537 --- .../media/filters/ec3_audio_util_unittest.cc | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/packager/media/filters/ec3_audio_util_unittest.cc b/packager/media/filters/ec3_audio_util_unittest.cc index d1b7d2b375..64d3029198 100644 --- a/packager/media/filters/ec3_audio_util_unittest.cc +++ b/packager/media/filters/ec3_audio_util_unittest.cc @@ -6,6 +6,7 @@ #include +#include "packager/base/macros.h" #include "packager/media/filters/ec3_audio_util.h" namespace edash_packager { @@ -14,18 +15,22 @@ namespace media { TEST(EC3AudioUtilTest, CalculateEC3ChannelMapTest1) { // audio_coding_mode is 7, which is Left, Center, Right, Left surround, Right // surround. No dependent substreams. LFE channel on. - const std::vector ec3_data = {0, 0, 0, 0x0f, 0}; + const uint8_t kEc3Data[] = {0, 0, 0, 0x0f, 0}; uint32_t channel_map; - EXPECT_TRUE(CalculateEC3ChannelMap(ec3_data, &channel_map)); + EXPECT_TRUE(CalculateEC3ChannelMap( + std::vector(kEc3Data, kEc3Data + arraysize(kEc3Data)), + &channel_map)); EXPECT_EQ(0xF801u, channel_map); } TEST(EC3AudioUtilTest, CalculateEC3ChannelMapTest2) { // audio_coding_mode is 2, which is Left and Right. No dependent substreams. // LFE channel off. - const std::vector ec3_data = {0, 0, 0, 0x04, 0}; + const uint8_t kEc3Data[] = {0, 0, 0, 0x04, 0}; uint32_t channel_map; - EXPECT_TRUE(CalculateEC3ChannelMap(ec3_data, &channel_map)); + EXPECT_TRUE(CalculateEC3ChannelMap( + std::vector(kEc3Data, kEc3Data + arraysize(kEc3Data)), + &channel_map)); EXPECT_EQ(0xA000u, channel_map); } @@ -33,9 +38,11 @@ TEST(EC3AudioUtilTest, CalculateEC3ChannelMapTest3) { // audio_coding_mode is 3, which is Left, Center, and Right. Dependent // substreams layout is 0b100000011, which is Left center/ Right center pair, // Left rear surround/ Right rear surround pair, LFE2 on. LFE channel on. - const std::vector ec3_data = {0, 0, 0, 0x07, 0x07, 0x03}; + const uint8_t kEc3Data[] = {0, 0, 0, 0x07, 0x07, 0x03}; uint32_t channel_map; - EXPECT_TRUE(CalculateEC3ChannelMap(ec3_data, &channel_map)); + EXPECT_TRUE(CalculateEC3ChannelMap( + std::vector(kEc3Data, kEc3Data + arraysize(kEc3Data)), + &channel_map)); EXPECT_EQ(0xE603u, channel_map); }