From c76c096c19079a207130f0bc59148d54e482c63c Mon Sep 17 00:00:00 2001 From: "pwestin@webrtc.org" Date: Mon, 13 Feb 2012 09:56:57 +0000 Subject: [PATCH] Bugfix issue 273, workaround for compiler issue. Review URL: https://webrtc-codereview.appspot.com/392005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1675 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../vp8/main/source/temporal_layers_unittest.cc | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/modules/video_coding/codecs/vp8/main/source/temporal_layers_unittest.cc b/src/modules/video_coding/codecs/vp8/main/source/temporal_layers_unittest.cc index 7b35c6f5e..6525ddaa8 100644 --- a/src/modules/video_coding/codecs/vp8/main/source/temporal_layers_unittest.cc +++ b/src/modules/video_coding/codecs/vp8/main/source/temporal_layers_unittest.cc @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. + * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. * * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source @@ -81,7 +81,8 @@ TEST(TemporalLayersTest, 2Layers) { EXPECT_EQ(expected_flags[i], tl.EncodeFlags()); tl.PopulateCodecSpecific(false, &vp8_info); EXPECT_EQ(expected_temporal_idx[i], vp8_info.temporalIdx); - EXPECT_EQ(expected_layer_sync[i], vp8_info.layerSync); + bool expected_sync = expected_layer_sync[i]; + EXPECT_EQ(expected_sync, vp8_info.layerSync); } } @@ -119,7 +120,8 @@ TEST(TemporalLayersTest, 3Layers) { EXPECT_EQ(expected_flags[i], tl.EncodeFlags()); tl.PopulateCodecSpecific(false, &vp8_info); EXPECT_EQ(expected_temporal_idx[i], vp8_info.temporalIdx); - EXPECT_EQ(expected_layer_sync[i], vp8_info.layerSync); + bool expected_sync = expected_layer_sync[i]; + EXPECT_EQ(expected_sync, vp8_info.layerSync); } } @@ -157,7 +159,8 @@ TEST(TemporalLayersTest, 4Layers) { EXPECT_EQ(expected_flags[i], tl.EncodeFlags()); tl.PopulateCodecSpecific(false, &vp8_info); EXPECT_EQ(expected_temporal_idx[i], vp8_info.temporalIdx); - EXPECT_EQ(expected_layer_sync[i], vp8_info.layerSync); + bool expected_sync = expected_layer_sync[i]; + EXPECT_EQ(expected_sync, vp8_info.layerSync); } } @@ -187,11 +190,13 @@ TEST(TemporalLayersTest, KeyFrame) { EXPECT_EQ(expected_flags[i], tl.EncodeFlags()); tl.PopulateCodecSpecific(true, &vp8_info); EXPECT_EQ(expected_temporal_idx[i], vp8_info.temporalIdx); - EXPECT_EQ(expected_layer_sync[i], vp8_info.layerSync); + bool expected_sync = expected_layer_sync[i]; + EXPECT_EQ(expected_sync, vp8_info.layerSync); } EXPECT_EQ(expected_flags[7], tl.EncodeFlags()); tl.PopulateCodecSpecific(false, &vp8_info); EXPECT_EQ(expected_temporal_idx[7], vp8_info.temporalIdx); - EXPECT_EQ(expected_layer_sync[7], vp8_info.layerSync); + bool expected_sync = expected_layer_sync[7]; + EXPECT_EQ(expected_sync, vp8_info.layerSync); } } // namespace webrtc