| Index: webrtc/modules/video_processing/test/brightness_detection_test.cc
|
| diff --git a/webrtc/modules/video_processing/test/brightness_detection_test.cc b/webrtc/modules/video_processing/test/brightness_detection_test.cc
|
| index b46fc2bd2f64d770f17f0e393848b26008d466a1..041a6e090f52a40a9982d0f0c7d4fd3324fe1117 100644
|
| --- a/webrtc/modules/video_processing/test/brightness_detection_test.cc
|
| +++ b/webrtc/modules/video_processing/test/brightness_detection_test.cc
|
| @@ -16,100 +16,101 @@
|
| namespace webrtc {
|
|
|
| TEST_F(VideoProcessingTest, DISABLED_ON_IOS(BrightnessDetection)) {
|
| - uint32_t frameNum = 0;
|
| - int32_t brightnessWarning = 0;
|
| - uint32_t warningCount = 0;
|
| - rtc::scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
|
| - while (fread(video_buffer.get(), 1, frame_length_, source_file_) ==
|
| - frame_length_) {
|
| - EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_,
|
| - height_, 0, kVideoRotation_0, &video_frame_));
|
| - frameNum++;
|
| - VideoProcessing::FrameStats stats;
|
| - vp_->GetFrameStats(video_frame_, &stats);
|
| - EXPECT_GT(stats.num_pixels, 0u);
|
| - ASSERT_GE(brightnessWarning = vp_->BrightnessDetection(video_frame_,
|
| - stats), 0);
|
| - if (brightnessWarning != VideoProcessing::kNoWarning) {
|
| - warningCount++;
|
| - }
|
| + uint32_t frameNum = 0;
|
| + int32_t brightnessWarning = 0;
|
| + uint32_t warningCount = 0;
|
| + rtc::scoped_ptr<uint8_t[]> video_buffer(new uint8_t[frame_length_]);
|
| + while (fread(video_buffer.get(), 1, frame_length_, source_file_) ==
|
| + frame_length_) {
|
| + EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_, height_,
|
| + 0, kVideoRotation_0, &video_frame_));
|
| + frameNum++;
|
| + VideoProcessing::FrameStats stats;
|
| + vp_->GetFrameStats(video_frame_, &stats);
|
| + EXPECT_GT(stats.num_pixels, 0u);
|
| + ASSERT_GE(brightnessWarning = vp_->BrightnessDetection(video_frame_, stats),
|
| + 0);
|
| + if (brightnessWarning != VideoProcessing::kNoWarning) {
|
| + warningCount++;
|
| }
|
| - ASSERT_NE(0, feof(source_file_)) << "Error reading source file";
|
| + }
|
| + ASSERT_NE(0, feof(source_file_)) << "Error reading source file";
|
|
|
| - // Expect few warnings
|
| - float warningProportion = static_cast<float>(warningCount) / frameNum * 100;
|
| - printf("\nWarning proportions:\n");
|
| - printf("Stock foreman: %.1f %%\n", warningProportion);
|
| - EXPECT_LT(warningProportion, 10);
|
| + // Expect few warnings
|
| + float warningProportion = static_cast<float>(warningCount) / frameNum * 100;
|
| + printf("\nWarning proportions:\n");
|
| + printf("Stock foreman: %.1f %%\n", warningProportion);
|
| + EXPECT_LT(warningProportion, 10);
|
|
|
| - rewind(source_file_);
|
| - frameNum = 0;
|
| - warningCount = 0;
|
| - while (fread(video_buffer.get(), 1, frame_length_, source_file_) ==
|
| - frame_length_ &&
|
| - frameNum < 300) {
|
| - EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_,
|
| - height_, 0, kVideoRotation_0, &video_frame_));
|
| - frameNum++;
|
| + rewind(source_file_);
|
| + frameNum = 0;
|
| + warningCount = 0;
|
| + while (fread(video_buffer.get(), 1, frame_length_, source_file_) ==
|
| + frame_length_ &&
|
| + frameNum < 300) {
|
| + EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_, height_,
|
| + 0, kVideoRotation_0, &video_frame_));
|
| + frameNum++;
|
|
|
| - uint8_t* frame = video_frame_.buffer(kYPlane);
|
| - uint32_t yTmp = 0;
|
| - for (int yIdx = 0; yIdx < width_ * height_; yIdx++) {
|
| - yTmp = frame[yIdx] << 1;
|
| - if (yTmp > 255) {
|
| - yTmp = 255;
|
| - }
|
| - frame[yIdx] = static_cast<uint8_t>(yTmp);
|
| - }
|
| + uint8_t* frame = video_frame_.buffer(kYPlane);
|
| + uint32_t yTmp = 0;
|
| + for (int yIdx = 0; yIdx < width_ * height_; yIdx++) {
|
| + yTmp = frame[yIdx] << 1;
|
| + if (yTmp > 255) {
|
| + yTmp = 255;
|
| + }
|
| + frame[yIdx] = static_cast<uint8_t>(yTmp);
|
| + }
|
|
|
| - VideoProcessing::FrameStats stats;
|
| - vp_->GetFrameStats(video_frame_, &stats);
|
| - EXPECT_GT(stats.num_pixels, 0u);
|
| - ASSERT_GE(brightnessWarning = vp_->BrightnessDetection(video_frame_,
|
| - stats), 0);
|
| - EXPECT_NE(VideoProcessing::kDarkWarning, brightnessWarning);
|
| - if (brightnessWarning == VideoProcessing::kBrightWarning) {
|
| - warningCount++;
|
| - }
|
| + VideoProcessing::FrameStats stats;
|
| + vp_->GetFrameStats(video_frame_, &stats);
|
| + EXPECT_GT(stats.num_pixels, 0u);
|
| + ASSERT_GE(brightnessWarning = vp_->BrightnessDetection(video_frame_, stats),
|
| + 0);
|
| + EXPECT_NE(VideoProcessing::kDarkWarning, brightnessWarning);
|
| + if (brightnessWarning == VideoProcessing::kBrightWarning) {
|
| + warningCount++;
|
| }
|
| - ASSERT_NE(0, feof(source_file_)) << "Error reading source file";
|
| + }
|
| + ASSERT_NE(0, feof(source_file_)) << "Error reading source file";
|
|
|
| - // Expect many brightness warnings
|
| - warningProportion = static_cast<float>(warningCount) / frameNum * 100;
|
| - printf("Bright foreman: %.1f %%\n", warningProportion);
|
| - EXPECT_GT(warningProportion, 95);
|
| + // Expect many brightness warnings
|
| + warningProportion = static_cast<float>(warningCount) / frameNum * 100;
|
| + printf("Bright foreman: %.1f %%\n", warningProportion);
|
| + EXPECT_GT(warningProportion, 95);
|
|
|
| - rewind(source_file_);
|
| - frameNum = 0;
|
| - warningCount = 0;
|
| - while (fread(video_buffer.get(), 1, frame_length_, source_file_) ==
|
| - frame_length_ && frameNum < 300) {
|
| - EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_,
|
| - height_, 0, kVideoRotation_0, &video_frame_));
|
| - frameNum++;
|
| + rewind(source_file_);
|
| + frameNum = 0;
|
| + warningCount = 0;
|
| + while (fread(video_buffer.get(), 1, frame_length_, source_file_) ==
|
| + frame_length_ &&
|
| + frameNum < 300) {
|
| + EXPECT_EQ(0, ConvertToI420(kI420, video_buffer.get(), 0, 0, width_, height_,
|
| + 0, kVideoRotation_0, &video_frame_));
|
| + frameNum++;
|
|
|
| - uint8_t* y_plane = video_frame_.buffer(kYPlane);
|
| - int32_t yTmp = 0;
|
| - for (int yIdx = 0; yIdx < width_ * height_; yIdx++) {
|
| - yTmp = y_plane[yIdx] >> 1;
|
| - y_plane[yIdx] = static_cast<uint8_t>(yTmp);
|
| - }
|
| + uint8_t* y_plane = video_frame_.buffer(kYPlane);
|
| + int32_t yTmp = 0;
|
| + for (int yIdx = 0; yIdx < width_ * height_; yIdx++) {
|
| + yTmp = y_plane[yIdx] >> 1;
|
| + y_plane[yIdx] = static_cast<uint8_t>(yTmp);
|
| + }
|
|
|
| - VideoProcessing::FrameStats stats;
|
| - vp_->GetFrameStats(video_frame_, &stats);
|
| - EXPECT_GT(stats.num_pixels, 0u);
|
| - ASSERT_GE(brightnessWarning = vp_->BrightnessDetection(video_frame_,
|
| - stats), 0);
|
| - EXPECT_NE(VideoProcessing::kBrightWarning, brightnessWarning);
|
| - if (brightnessWarning == VideoProcessing::kDarkWarning) {
|
| - warningCount++;
|
| - }
|
| + VideoProcessing::FrameStats stats;
|
| + vp_->GetFrameStats(video_frame_, &stats);
|
| + EXPECT_GT(stats.num_pixels, 0u);
|
| + ASSERT_GE(brightnessWarning = vp_->BrightnessDetection(video_frame_, stats),
|
| + 0);
|
| + EXPECT_NE(VideoProcessing::kBrightWarning, brightnessWarning);
|
| + if (brightnessWarning == VideoProcessing::kDarkWarning) {
|
| + warningCount++;
|
| }
|
| - ASSERT_NE(0, feof(source_file_)) << "Error reading source file";
|
| + }
|
| + ASSERT_NE(0, feof(source_file_)) << "Error reading source file";
|
|
|
| - // Expect many darkness warnings
|
| - warningProportion = static_cast<float>(warningCount) / frameNum * 100;
|
| - printf("Dark foreman: %.1f %%\n\n", warningProportion);
|
| - EXPECT_GT(warningProportion, 90);
|
| + // Expect many darkness warnings
|
| + warningProportion = static_cast<float>(warningCount) / frameNum * 100;
|
| + printf("Dark foreman: %.1f %%\n\n", warningProportion);
|
| + EXPECT_GT(warningProportion, 90);
|
| }
|
| } // namespace webrtc
|
|
|