Macro incorrectly displays DISABLED_ON_ANDROID in test names for parameterized tests under --gtest_list_tests, causing tests to be disabled on all platforms since they contain the DISABLED_ prefix rather than their expanded variants. This expands the macro variants to inline if they're disabled or not, and removes building some tests under configurations where they should fail, instead of building them but disabling them by default. The change also removes gtest_disable.h as an unused include from many other files. BUG=webrtc:5387, webrtc:5400 R=kjellander@webrtc.org, phoglund@webrtc.org TBR=henrik.lundin@webrtc.org Review URL: https://codereview.webrtc.org/1547343002 . Cr-Commit-Position: refs/heads/master@{#11150}
49 lines
1.9 KiB
C++
49 lines
1.9 KiB
C++
/*
|
|
* Copyright (c) 2011 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
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
|
|
#include "webrtc/modules/video_processing/include/video_processing.h"
|
|
#include "webrtc/modules/video_processing/content_analysis.h"
|
|
#include "webrtc/modules/video_processing/test/video_processing_unittest.h"
|
|
|
|
namespace webrtc {
|
|
|
|
#if defined(WEBRTC_IOS)
|
|
TEST_F(VideoProcessingTest, DISABLED_ContentAnalysis) {
|
|
#else
|
|
TEST_F(VideoProcessingTest, ContentAnalysis) {
|
|
#endif
|
|
VPMContentAnalysis ca__c(false);
|
|
VPMContentAnalysis ca__sse(true);
|
|
VideoContentMetrics* _cM_c;
|
|
VideoContentMetrics* _cM_SSE;
|
|
|
|
ca__c.Initialize(width_, height_);
|
|
ca__sse.Initialize(width_, height_);
|
|
|
|
rtc::scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
|
|
while (fread(video_buffer.get(), 1, frame_length_, source_file_) ==
|
|
frame_length_) {
|
|
// Using ConvertToI420 to add stride to the image.
|
|
EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_, height_,
|
|
0, kVideoRotation_0, &video_frame_));
|
|
_cM_c = ca__c.ComputeContentMetrics(video_frame_);
|
|
_cM_SSE = ca__sse.ComputeContentMetrics(video_frame_);
|
|
|
|
ASSERT_EQ(_cM_c->spatial_pred_err, _cM_SSE->spatial_pred_err);
|
|
ASSERT_EQ(_cM_c->spatial_pred_err_v, _cM_SSE->spatial_pred_err_v);
|
|
ASSERT_EQ(_cM_c->spatial_pred_err_h, _cM_SSE->spatial_pred_err_h);
|
|
ASSERT_EQ(_cM_c->motion_magnitude, _cM_SSE->motion_magnitude);
|
|
}
|
|
ASSERT_NE(0, feof(source_file_)) << "Error reading source file";
|
|
}
|
|
|
|
} // namespace webrtc
|